From: taejun Date: Thu, 13 Jun 2013 08:23:57 +0000 (+0900) Subject: [DIBS web] remove DEPRECATED status in distribution X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=506104e5b3647bd30016496f9e03fe8a19a17b25;p=sdk%2Ftools%2Fsdk-build.git [DIBS web] remove DEPRECATED status in distribution --- diff --git a/dibs-web/app/controllers/admin_group_controller.rb b/dibs-web/app/controllers/admin_group_controller.rb index f7f94f1..22b538e 100644 --- a/dibs-web/app/controllers/admin_group_controller.rb +++ b/dibs-web/app/controllers/admin_group_controller.rb @@ -54,7 +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' + AND distributions.status = 'OPEN' ORDER BY projects.name") project_list.each do |project| @@ -96,7 +96,7 @@ class AdminGroupController < ApplicationController FROM projects , distributions WHERE distributions.id = projects.distribution_id - AND distributions.status <> 'DEPRECATED' + AND distributions.status = 'OPEN' 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 bab5aaf..bfc5fa7 100644 --- a/dibs-web/app/controllers/admin_project_controller.rb +++ b/dibs-web/app/controllers/admin_project_controller.rb @@ -27,37 +27,6 @@ Contributors: =end class AdminProjectController < ApplicationController - def queryAllProject - project_list = Project.find_by_sql("SELECT projects.name AS project_name - , projects.id AS project_id - , distributions.id AS distribution_id - , distributions.name AS distribution_name - 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 ) - doc.Response { - generate_xml_header(doc) - - doc.Data { - project_list.each do |project| - doc.Project{ - doc.Id(project.project_id) - doc.Name(project.project_name) - doc.DistId(project.distribution_id) - doc.DistName(project.distribution_name) - } - end - } - } - - #send_data - render :text => out_string, :content_type => "text/xml" - end - def queryProjectsInDistributionForAdmin dist_id = params[:distId] diff --git a/dibs-web/app/controllers/projects_controller.rb b/dibs-web/app/controllers/projects_controller.rb index f7878fa..30ad127 100644 --- a/dibs-web/app/controllers/projects_controller.rb +++ b/dibs-web/app/controllers/projects_controller.rb @@ -367,7 +367,7 @@ class ProjectsController < ApplicationController def queryDistribution # get full distribution list - distribution_list = Distribution.find(:all, :conditions => ["status NOT IN ('DEPRECATED')"]) + distribution_list = Distribution.find(:all, :conditions => ["status = 'OPEN'"]) #generate to XML doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) @@ -411,6 +411,37 @@ class ProjectsController < ApplicationController render :text => out_string, :content_type => "text/xml" end + def queryAllProjectInOpenStatus + project_list = Project.find_by_sql("SELECT projects.name AS project_name + , projects.id AS project_id + , distributions.id AS distribution_id + , distributions.name AS distribution_name + FROM projects + , distributions + WHERE distributions.id = projects.distribution_id + AND distributions.status = 'OPEN' + ORDER BY projects.name") + + doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) + doc.Response { + generate_xml_header(doc) + + doc.Data { + project_list.each do |project| + doc.Project{ + doc.Id(project.project_id) + doc.Name(project.project_name) + doc.DistId(project.distribution_id) + doc.DistName(project.distribution_name) + } + end + } + } + + #send_data + render :text => out_string, :content_type => "text/xml" + end + def projects end diff --git a/dibs-web/config/routes.rb b/dibs-web/config/routes.rb index 3c65e30..851c7e8 100644 --- a/dibs-web/config/routes.rb +++ b/dibs-web/config/routes.rb @@ -63,6 +63,7 @@ Dibs::Application.routes.draw do get "projects/queryDistribution" get "projects/queryAllDistribution" + get "projects/queryAllProjectInOpenStatus" post "projects/binaryFileUpload" # projects @@ -102,7 +103,6 @@ Dibs::Application.routes.draw do post "admin_server/modifyServerInfo" # admin project - get "admin_project/queryAllProject" match "admin_project/queryProjectsInDistributionForAdmin/:distId" => "admin_project#queryProjectsInDistributionForAdmin" post "admin_project/addProject" post "admin_project/removeProject" diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html index 9460b35..14ff2ec 100644 --- a/dibs-web/public/index.html +++ b/dibs-web/public/index.html @@ -559,7 +559,6 @@ Contributors:
diff --git a/dibs-web/public/javascripts/admin-distribution-modify.js b/dibs-web/public/javascripts/admin-distribution-modify.js index dac8096..1508088 100644 --- a/dibs-web/public/javascripts/admin-distribution-modify.js +++ b/dibs-web/public/javascripts/admin-distribution-modify.js @@ -78,12 +78,6 @@ function adminDistributionModifyPopupInit() { } $("#adminDistributionModify-status").append(option); - if(serverStatusText.toUpperCase() == "DEPRECATED") { - option = ''; - } else { - option = ''; - } - $("#adminDistributionModify-status").append(option); $("#adminDistributionModify-status").selectmenu("refresh"); } diff --git a/dibs-web/public/javascripts/admin-group-add.js b/dibs-web/public/javascripts/admin-group-add.js index 9811bd6..949b384 100644 --- a/dibs-web/public/javascripts/admin-group-add.js +++ b/dibs-web/public/javascripts/admin-group-add.js @@ -30,7 +30,7 @@ function adminGroupAddInit() { $("#adminGroupAdd-name").val(""); $("#adminGroupAdd-description").val(""); - queryAllProject( function(xml) { + queryAllProjectInOpenStatus( function(xml) { var fullProjectList = $(xml).find("Data").find("Project"); adminGroupAddGenerateProjectSelect(fullProjectList); diff --git a/dibs-web/public/javascripts/dibs-api.js b/dibs-web/public/javascripts/dibs-api.js index a45c45d..fd324b7 100644 --- a/dibs-web/public/javascripts/dibs-api.js +++ b/dibs-web/public/javascripts/dibs-api.js @@ -67,7 +67,11 @@ function queryAllDistribution(successFunction) { getInfoFromServer(url, successFunction); } -// controller : projects +function queryAllProjectInOpenStatus(successFunction) { + var url = 'projects/queryAllProjectInOpenStatus'; + getInfoFromServer(url, successFunction); +} + function buildProject(changeInfoList, successFunction) { var url = 'projects/buildProject'; postForServer(url, changeInfoList, successFunction); @@ -230,11 +234,6 @@ function modifyServerInfo(changeInfoList, successFunction) { } // controller : admin_project -function queryAllProject(successFunction) { - var url = 'admin_project/queryAllProject'; - getInfoFromServer(url, successFunction); -} - function queryProjectsInDistributionForAdmin(distId, successFunction) { var url = 'admin_project/queryProjectsInDistributionForAdmin/' + distId; getInfoFromServer(url, successFunction); diff --git a/dibs-web/public/javascripts/jobs.js b/dibs-web/public/javascripts/jobs.js index dd6ca35..cb7260d 100644 --- a/dibs-web/public/javascripts/jobs.js +++ b/dibs-web/public/javascripts/jobs.js @@ -568,7 +568,7 @@ function jobsQueryProjectsList() { suggestion_list = []; if(distribution == "ALL") { - queryAllProject(function(xml) { + queryAllProjectInOpenStatus(function(xml) { var idx = 0; $(xml).find("Data").find("Project").each(function(){