From c8f94bac7e4485351a1f95704862f89ebd30b047 Mon Sep 17 00:00:00 2001
From: dibs <dibs@samsung.com>
Date: Wed, 12 Dec 2012 22:16:52 +0900
Subject: [PATCH] [Title] Fix dibs web bug -> status, build page distrivbution,
 job more button

---
 dibs-web/app/controllers/jobs_controller.rb | 18 +++++++++---------
 dibs-web/public/index.html                  |  2 +-
 dibs-web/public/javascripts/build.js        |  2 +-
 dibs-web/public/javascripts/jobs.js         |  6 +++---
 src/build_server/DistributionManager.rb     |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dibs-web/app/controllers/jobs_controller.rb b/dibs-web/app/controllers/jobs_controller.rb
index 4edf850..943db2a 100644
--- a/dibs-web/app/controllers/jobs_controller.rb
+++ b/dibs-web/app/controllers/jobs_controller.rb
@@ -29,13 +29,13 @@ class JobsController < ApplicationController
 		end
 
 		if(status == "ALL")
-			status = "'FINISHED', 'JUST_CREATED', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCEL'"
+			status = "'FINISHED', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
 		elsif(status == "SUCCESS")
 			status = "'FINISHED'"
 		elsif(status == "WORKING")
-			status = "'JUST_CREATE', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
+			status = "'JUST_CREATE', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
 		elsif(status == "ERROR")
-			status = "'ERROR', 'CANCEL'"
+			status = "'ERROR', 'CANCELED'"
 		end
 
 		if(last_id == "LATEST")
@@ -131,13 +131,13 @@ class JobsController < ApplicationController
 		end
 
 		if(status == "ALL")
-			status = "'FINISHED', 'WORKING', 'REMOTE_WORKING', 'INITAIL', 'ERROR', 'CANCEL'"
+			status = "'FINISHED', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
 		elsif(status == "SUCCESS")
 			status = "'FINISHED'"
 		elsif(status == "WORKING")
-			status = "'WORKING', 'REMOTE_WORKING', 'INITAIL'"
+			status = "'JUST_CREATE', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
 		elsif(status == "ERROR")
-			status = "'ERROR', 'CANCEL'"
+			status = "'ERROR', 'CANCELED'"
 		end
 
 		if(last_id == "LATEST")
@@ -223,13 +223,13 @@ class JobsController < ApplicationController
 		end
 
 		if(status == "ALL")
-			status = "'FINISHED', 'WORKING', 'REMOTE_WORKING', 'INITAIL', 'ERROR', 'CANCEL'"
+			status = "'FINISHED', 'JUST_CREATED', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING', 'ERROR', 'CANCELED'"
 		elsif(status == "SUCCESS")
 			status = "'FINISHED'"
 		elsif(status == "WORKING")
-			status = "'WORKING', 'REMOTE_WORKING', 'INITAIL'"
+			status = "'JUST_CREATE', 'WAITING', 'WORKING', 'REMOTE_WORKING', 'PENDING'"
 		elsif(status == "ERROR")
-			status = "'ERROR', 'CANCEL'"
+			status = "'ERROR', 'CANCELED'"
 		end
 
 		if(last_id == "LATEST")
diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html
index ce97159..ab1eddd 100644
--- a/dibs-web/public/index.html
+++ b/dibs-web/public/index.html
@@ -178,7 +178,7 @@
 			<div class="content-primary">
 				<div>
 					<div data-role="fieldcontain" style="text-align: center; font-size: 14px;">
-						<select id="select-distribution"  data-native-menu="false" onchange="projectsQueryProjectList()">
+						<select id="select-distribution"  data-native-menu="false" onchange="buildQueryProjectList()">
 						</select>
 					</div>
 				</div>
diff --git a/dibs-web/public/javascripts/build.js b/dibs-web/public/javascripts/build.js
index 77b53c1..1b9d247 100644
--- a/dibs-web/public/javascripts/build.js
+++ b/dibs-web/public/javascripts/build.js
@@ -17,7 +17,7 @@ function buildInit() {
 		buildQueryProjectList();
 
 		// query Running project list
-		buildQueryRunningProjectList();
+		//buildQueryRunningProjectList();
 
 		// add batch file selector event
 		//buildBatchFilePathSelector();
diff --git a/dibs-web/public/javascripts/jobs.js b/dibs-web/public/javascripts/jobs.js
index ff172d5..3e67518 100644
--- a/dibs-web/public/javascripts/jobs.js
+++ b/dibs-web/public/javascripts/jobs.js
@@ -263,8 +263,8 @@ function jobQueryDistribution() {
 	}, errorProcess);
 }
 
-function queryJobList(requestUrl, distribution, jobStatus, jobId) {
-		var url = requestUrl+"/"+ distribution +"/"+ jobStatus+"/"+jobId;
+function queryJobList(requestUrl, distribution, selectedStatus, jobId) {
+		var url = requestUrl+"/"+ distribution +"/"+ selectedStatus+"/"+jobId;
 console.log(url);
 //console.log(escape(url));
 //console.log(encodeURI(url));
@@ -336,7 +336,7 @@ console.log(url);
 			console.log(lastJobId);
 			if(lastJobId > 0)
 			{
-				var moreJobListUrl = 'queryJobList("'+requestUrl+'", "'+distribution+'", "'+lastJobId+'")';
+				var moreJobListUrl = 'queryJobList("'+requestUrl+'", "'+distribution+'", "'+selectedStatus+'", "'+lastJobId+'")';
 				$('#moreJobList').attr("onClick", moreJobListUrl);
 				$('#moreJobList').removeClass('ui-disabled');
 			}
diff --git a/src/build_server/DistributionManager.rb b/src/build_server/DistributionManager.rb
index 2ef9a27..2550496 100644
--- a/src/build_server/DistributionManager.rb
+++ b/src/build_server/DistributionManager.rb
@@ -81,7 +81,7 @@ class PackageDistribution
 
 
 	def self.load_first(db)
-		row = db.select_one("SELECT * FROM distributions")
+		row = db.select_one("SELECT * FROM distributions ORDER BY id")
 		return ( row.nil? ) ? nil : load_row(row)
 	end
 
-- 
2.34.1