From: taejun <samsung.com>
Date: Thu, 13 Jun 2013 04:51:13 +0000 (+0900)
Subject: [DIBS web] distribution deprecated status add
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2314a82024e068bc4a8e1008aaec7d4856aca732;p=sdk%2Ftools%2Fsdk-build.git

[DIBS web] distribution deprecated status add
---

diff --git a/dibs-web/app/controllers/admin_group_controller.rb b/dibs-web/app/controllers/admin_group_controller.rb
index 309d0c8..f7f94f1 100644
--- a/dibs-web/app/controllers/admin_group_controller.rb
+++ b/dibs-web/app/controllers/admin_group_controller.rb
@@ -54,6 +54,7 @@ class AdminGroupController < ApplicationController
 																		WHERE group_project_accesses.group_id = #{group.id}
 																		  AND projects.id = group_project_accesses.project_id
 																		  AND distributions.id = projects.distribution_id
+																		  AND distributions.status <> 'DEPRECATED'
 																		ORDER BY projects.name")
 
 						project_list.each do |project|
@@ -95,6 +96,7 @@ class AdminGroupController < ApplicationController
 													  FROM projects
 													 	 , distributions
 													 WHERE distributions.id = projects.distribution_id
+													   AND distributions.status <> 'DEPRECATED'
 													 ORDER BY projects.name")
 																  
 				project_list.each do |project|
diff --git a/dibs-web/app/controllers/admin_project_controller.rb b/dibs-web/app/controllers/admin_project_controller.rb
index 2a23fef..bab5aaf 100644
--- a/dibs-web/app/controllers/admin_project_controller.rb
+++ b/dibs-web/app/controllers/admin_project_controller.rb
@@ -35,6 +35,7 @@ class AdminProjectController < ApplicationController
 											  FROM projects
 											 	 , distributions
 											 WHERE distributions.id = projects.distribution_id
+											   AND distributions.status <> 'DEPRECATED'
 											 ORDER BY projects.name")
 
 		doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 )
diff --git a/dibs-web/app/controllers/projects_controller.rb b/dibs-web/app/controllers/projects_controller.rb
index dc8d863..f7878fa 100644
--- a/dibs-web/app/controllers/projects_controller.rb
+++ b/dibs-web/app/controllers/projects_controller.rb
@@ -367,6 +367,29 @@ class ProjectsController < ApplicationController
 
   def queryDistribution
 	# get full distribution list
+	distribution_list = Distribution.find(:all, :conditions => ["status NOT IN ('DEPRECATED')"])
+
+	#generate to XML
+	doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 )
+	doc.Response {
+		generate_xml_header(doc)
+
+		doc.Data {
+			distribution_list.each do |distribution|
+				doc.Distribution {
+					doc.Id(distribution.id)
+					doc.Name(distribution.name)
+				}
+			end
+		}
+	}
+	
+	#send_data
+	render :text => out_string, :content_type => "text/xml"
+  end
+
+  def queryAllDistribution
+	# get full distribution list
 	distribution_list = Distribution.find(:all)
 
 	#generate to XML
diff --git a/dibs-web/config/routes.rb b/dibs-web/config/routes.rb
index 543e371..3c65e30 100644
--- a/dibs-web/config/routes.rb
+++ b/dibs-web/config/routes.rb
@@ -62,6 +62,7 @@ Dibs::Application.routes.draw do
 
 
 	get "projects/queryDistribution"
+	get "projects/queryAllDistribution"
 	post "projects/binaryFileUpload"
 	
 	# projects
diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html
index 18bf04b..9460b35 100644
--- a/dibs-web/public/index.html
+++ b/dibs-web/public/index.html
@@ -107,12 +107,12 @@ Contributors:
 					<input id="login-form-save" type="checkbox" name="save" class="custom" data-mini="true" checked/>
 					<label for="login-form-save">Save</label>
 				</span>
-				<span style="clear: both; float: left;">
+				<div style="clear: both; float: left;">
 					<label for="login-form-password">Password</label>
-				</span>
-				<span style="clear: both;">
+				</div>
+				<div style="clear: both;">
 					<input id="login-form-password" type="password" name="password"/>
-				</span>
+				</div>
 				<br/>
 				<div data-role="controlgroup" data-type="horizontal" style="float: left;">   
 					<a href="#" data-rel="back" data-role="button" data-mini="true" >Cancel</a>
@@ -559,6 +559,7 @@ Contributors:
 				<label for="adminDistributionAdd-status"> Distribution status </label>
 				<select id="adminDistributionAdd-status" name="status" >
 					<option value="OPEN" selected="selected">OPEN</option>
+					<option value="DEPRECATED">DEPRECATED</option>
 					<option value="CLOSE">CLOSE</option>
 				</select>
 				<br>
diff --git a/dibs-web/public/javascripts/admin-distribution-modify.js b/dibs-web/public/javascripts/admin-distribution-modify.js
index 8565e84..dac8096 100644
--- a/dibs-web/public/javascripts/admin-distribution-modify.js
+++ b/dibs-web/public/javascripts/admin-distribution-modify.js
@@ -77,6 +77,13 @@ function adminDistributionModifyPopupInit() {
 		option = '<option value="CLOSE">CLOSE</option>';
 	}
 	$("#adminDistributionModify-status").append(option);
+	
+	if(serverStatusText.toUpperCase() == "DEPRECATED") {
+		option = '<option value="DEPRECATED" selected="selected">DEPRECATED</option>';
+	} else {
+		option = '<option value="DEPRECATED">DEPRECATED</option>';
+	}
+	$("#adminDistributionModify-status").append(option);
 	$("#adminDistributionModify-status").selectmenu("refresh");
 }
 
diff --git a/dibs-web/public/javascripts/admin-distribution.js b/dibs-web/public/javascripts/admin-distribution.js
index 92e8db6..d75f66c 100644
--- a/dibs-web/public/javascripts/admin-distribution.js
+++ b/dibs-web/public/javascripts/admin-distribution.js
@@ -27,7 +27,7 @@ Contributors:
 */
 
 function adminDistributionInit() {
-	queryDistribution( function (xml) {
+	queryAllDistribution( function (xml) {
 		var oldDistId = $("#adminDistribution-distribution-select option:selected").val();
 		var find = false;
 		var distributionList = $(xml).find("Data").find("Distribution");
diff --git a/dibs-web/public/javascripts/dibs-api.js b/dibs-web/public/javascripts/dibs-api.js
index 475e119..a45c45d 100644
--- a/dibs-web/public/javascripts/dibs-api.js
+++ b/dibs-web/public/javascripts/dibs-api.js
@@ -62,6 +62,11 @@ function queryDistribution(successFunction) {
 	getInfoFromServer(url, successFunction);
 }
 
+function queryAllDistribution(successFunction) {
+	var url = 'projects/queryAllDistribution';
+	getInfoFromServer(url, successFunction);
+}
+
 // controller : projects
 function buildProject(changeInfoList, successFunction) {
 	var url = 'projects/buildProject';