[Title] Fix dibs web bug -> status, build page distrivbution, job more button

diff --git a/dibs-web/app/controllers/jobs_controller.rb b/dibs-web/app/controllers/jobs_controller.rb
index 4edf8502d0caa843c93d445c94b1970b59e3dd8d..943db2a29877f10051cfb01af321a19ab47e0e08 100644 (file)
--- 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 ce971590bbb1ba08527f93693efeba1fcf1cd74b..ab1eddd3ecf5a3966ea473be302cedbb371f95fa 100644 (file)
--- 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 77b53c1fe632f2f086c41420f04ddf658f94995a..1b9d247abed8add953ec34a0cc97b66f7fb67670 100644 (file)
--- 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 ff172d5581937c65af23fed5dea151fbadb6f7d7..3e675184e7d895e00d047fe564c570cd33ae7410 100644 (file)
--- 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 2ef9a2796e669d6178c41879093319eef9db118b..255049623b0be3a0fc7b0ca390b76ab255cd1365 100644 (file)
--- 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