[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 309d0c8edbd1c238481b30aa300b4be084a6a2c9..f7f94f14e63e4dc155199ddd5f0417fff3fa0c57 100644 (file)
--- 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 2a23fefc1e90b37c1893cc93e739f87c07761ebd..bab5aaf3d1a8dee3c16a7a2b1c7a3d757d431ebc 100644 (file)
--- 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 dc8d8633784baf9833fd077d5ede3fa0ba165a58..f7878fad3de326d03774a96a25262c82c341ff0d 100644 (file)
--- a/dibs-web/app/controllers/projects_controller.rb
+++ b/dibs-web/app/controllers/projects_controller.rb
@@ -366,6 +366,29 @@ class ProjectsController < ApplicationController
   end
 
   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)
 

diff --git a/dibs-web/config/routes.rb b/dibs-web/config/routes.rb
index 543e3715bcbbc6a5556a2219d69e5b92e6f14b05..3c65e306b8c1532017c8acdd334ebe12eecbb412 100644 (file)
--- 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 18bf04b34bd1672993871194b6d48357739489cc..9460b350fa504267c605ed39792d9c01eec81882 100644 (file)
--- 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 8565e84847246e6070ca48c971eb9349771ba1c7..dac8096e4b3108720aa49b3c47d900b1b918325c 100644 (file)
--- 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 92e8db6c161a9bb5eb44ea29cf07f0d861a75199..d75f66ca7e84289e826ef0bada450b7605f9cf08 100644 (file)
--- 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 475e1198cbd3706cf3e0990f254a4a1586936d27..a45c45dc64888fb769b8ff5ab296def02924361e 100644 (file)
--- 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';