From 3aecd70d451f43ca173244d02068f570b7bb305d Mon Sep 17 00:00:00 2001
From: Sungmin Kim <dev.sungmin.kim@samsung.com>
Date: Tue, 4 Feb 2014 20:04:54 +0900
Subject: [PATCH] Fixed bug about query job in distribution. Signed-off-by:
 Sungmin Kim <dev.sungmin.kim@samsung.com>

Change-Id: Id953a9f1d57098dfd395eaca0ec92f356a21fe50
---
 dibs-web/app/controllers/jobs_controller.rb |  3 ++
 dibs-web/public/javascripts/jobs.js         | 57 ++++++++++++---------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/dibs-web/app/controllers/jobs_controller.rb b/dibs-web/app/controllers/jobs_controller.rb
index 01ec9f3..2f915b3 100644
--- a/dibs-web/app/controllers/jobs_controller.rb
+++ b/dibs-web/app/controllers/jobs_controller.rb
@@ -323,6 +323,8 @@ class JobsController < ApplicationController
 	def listQueryProject(doc, query_type, distribution, status, last_id, project)
 		if(distribution == "ALL")
 			distribution = "%"
+        else
+			distribution = distribution + "%"
 		end
 
 		if(status == "ALL")
@@ -370,6 +372,7 @@ class JobsController < ApplicationController
 							  WHERE #{condition}
 								AND jobs.status IN (#{status})
 								AND projects.name like '#{project}'
+								AND distributions.name like '#{distribution}'
 							  ORDER BY jobs.id DESC
 							  LIMIT #{QUERY_CNT}")
 
diff --git a/dibs-web/public/javascripts/jobs.js b/dibs-web/public/javascripts/jobs.js
index cb7260d..4841358 100644
--- a/dibs-web/public/javascripts/jobs.js
+++ b/dibs-web/public/javascripts/jobs.js
@@ -26,9 +26,9 @@ Contributors:
 - S-Core Co., Ltd
 */
 
-var suggestion_list = new Array();
+var suggestion_list = [];
 var update_ajax;
-var request_list = new Array();
+var request_list = [];
 var request_idx = 0;
 
 $(function() {
@@ -120,21 +120,21 @@ function jobsStatusSelected() {
 }
 
 function searchJobInput() {
-	var searchText = $("#jobs-search-input-text").val()
+	var searchText = $("#jobs-search-input-text").val();
 	if(searchText.length > 0) {
 		searchJob(searchText);
 	}
 }
 
 function searchJobDate() {
-	var searchText = $("#jobs-search-date-value").val()
+	var searchText = $("#jobs-search-date-value").val();
 	if(searchText.length > 0) {
 		searchJob(searchText);
 	}
 }
 
 function searchJob(searchText) {
-	var distribution = $("#jobs-distribution-select option:selected").val(); 
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
 	var selectedValue = $('#jobs-type-select').find("input[type='radio']:checked").val();
 	switch(selectedValue) {
 		case "ALL":
@@ -176,7 +176,7 @@ function selectJobId() {
 }
 
 function selectUser() {
-	var distribution = $("#jobs-distribution-select option:selected").val(); 
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
 	$("#jobs-search-date").hide();
 	$("#jobs-search-input").show();
 
@@ -187,7 +187,7 @@ function selectUser() {
 }
 
 function selectGroup() {
-	var distribution = $("#jobs-distribution-select option:selected").val(); 
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
 	$("#jobs-search-date").hide();
 	$("#jobs-search-input").show();
 
@@ -200,7 +200,7 @@ function selectGroup() {
 }
 
 function selectProject() {
-	var distribution = $("#jobs-distribution-select option:selected").val(); 
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
 	$("#jobs-search-date").hide();
 	$("#jobs-search-input").show();
 	clearJobList();
@@ -211,7 +211,7 @@ function selectProject() {
 }
 
 function selectDate() {
-	var distribution = $("#jobs-distribution-select option:selected").val(); 
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
 	var today = new Date();
 	var yyyy = today.getFullYear();
 	var mm = today.getMonth()+1; //January is 0!
@@ -283,7 +283,7 @@ function jobQueryDistribution() {
 				var id = $(this).find("Id").text();
 				var name = $(this).find("Name").text();
 		
-				$("#jobs-distribution-select").append("<option value=\'"+name+"\'>"+name+"</option>");
+				$("#jobs-distribution-select").append("<option value=\'"+id+"\'>"+name+"</option>");
 			});
 		
 			/* default distribution selection */
@@ -550,21 +550,32 @@ function jobSuggestListClick(suggestText) {
 	$("#jobs-search-input-text").val(suggestText);
 	$("#jobs-search-list").empty();
 
-	var startIndex = suggestText.search(/\[/);
-	var endIndex = suggestText.search('\]');
-
-	if(startIndex > 0 && endIndex >0) {
-		project = suggestText.substr(0, startIndex);
-		distribution = suggestText.substr(startIndex+1, endIndex-startIndex-1);
-		queryJobListProject(distribution, project);
-	}
-	else {
-		searchJob(suggestText);
-	}
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
+    var project = "";
+    console.log(distribution);
+
+    if(distribution === "ALL") {
+	    var startIndex = suggestText.search(/\[/);
+	    var endIndex = suggestText.search('\]');
+
+	    if(startIndex > 0 && endIndex >0) {
+	    	project = suggestText.substr(0, startIndex);
+	    	distribution = suggestText.substr(startIndex+1, endIndex-startIndex-1);
+	    	queryJobListProject(distribution, project);
+	    }
+	    else {
+	    	searchJob(suggestText);
+	    }
+    }
+    else {
+	    project = suggestText;
+	    queryJobListProject(distribution, project);
+    }
 }
 
 function jobsQueryProjectsList() {
-	var distribution = $("#jobs-distribution-select option:selected").val(); 
+	var distribution = $("#jobs-distribution-select option:selected").text(); 
+	var distribution_id = $("#jobs-distribution-select option:selected").val(); 
 	suggestion_list = [];
 
 	if(distribution == "ALL") {
@@ -580,7 +591,7 @@ function jobsQueryProjectsList() {
 		});
 	}
 	else {
-		queryProjectList(distribution, function(xml) {
+		queryProjectsInDistribution(distribution_id, function(xml) {
 			var idx = 0;
 	
 			$(xml).find("Data").find("Project").each(function(){
-- 
2.34.1