[title] fixed bug about url include dot, support IE9, add loading event(spinner)

[redmine] #7890

diff --git a/dibs-web/config/database.yml b/dibs-web/config/database.yml
index a9445ecec356d1054c1ff6cec96509f8f2286c66..319f61e84847ed42ae00139258f228da9a31cc75 100644 (file)
--- a/dibs-web/config/database.yml
+++ b/dibs-web/config/database.yml
@@ -43,4 +43,4 @@
    username: 
    password: 
    pool: 
-   timeout:
+   timeout: 

diff --git a/dibs-web/config/routes.rb b/dibs-web/config/routes.rb
index 12fdf8e7512ec4efb8b000f0385a69fc0193fd7c..d437d8db2f1cc3efa2e56f1fdbd8f590b321282a 100644 (file)
--- a/dibs-web/config/routes.rb
+++ b/dibs-web/config/routes.rb
@@ -24,23 +24,23 @@ Dibs::Application.routes.draw do
        post "sessions/login"
        delete "sessions/logout"
 
-    get "jobs/list/:distribution/:status/:lastID" => "jobs#listAll"
-    get "jobs/listSearchUser/:user/:distribution/:status/:lastID" => "jobs#listSearchUser"
-    get "jobs/listSearchGroup/:group/:distribution/:status/:lastID" => "jobs#listSearchGroup"
-    get "jobs/listSearchProject/:project/:distribution/:status/:lastID" => "jobs#listSearchProject", :constraints => { :project => /[0-9A-Za-z\-\.]+/ }
-    get "jobs/listSearchDate/:date/:distribution/:status/:lastID" => "jobs#listSearchDate"
+    get "jobs/list/:distribution/:status/:lastID" => "jobs#listAll", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
+    get "jobs/listSearchUser/:user/:distribution/:status/:lastID" => "jobs#listSearchUser", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
+    get "jobs/listSearchGroup/:group/:distribution/:status/:lastID" => "jobs#listSearchGroup", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
+    get "jobs/listSearchProject/:project/:distribution/:status/:lastID" => "jobs#listSearchProject" , :constraints => { :project => /[0-9A-Za-z\-\.]+/ }
+    get "jobs/listSearchDate/:date/:distribution/:status/:lastID" => "jobs#listSearchDate", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
 
        match "jobs/log/:id" => "jobs#log"
        match "jobs/log/:id/:line" => "jobs#log_more"
 
        get "projects/queryDistribution"
-       match "projects/queryProject/:distribution" => "projects#queryProject"
+       match "projects/queryProject/:distribution" => "projects#queryProject", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
        post "projects/binaryFileUpload"
        
        # projects
        match "projects/queryRunningProjectsInfoInDistribution/:distribution" => "projects#queryRunningProjectsInfoInDistribution"
-       match "projects/queryProjectsInfoInDistribution/:distribution" => "projects#queryProjectsInfoInDistribution" 
-       match "projects/queryProjectsInDistribution/:distribution" => "projects#queryProjectsInDistribution" 
+       match "projects/queryProjectsInfoInDistribution/:distribution" => "projects#queryProjectsInfoInDistribution", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
+       match "projects/queryProjectsInDistribution/:distribution" => "projects#queryProjectsInDistribution" , :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
        post "projects/buildProject" 
 
        # admin group
@@ -72,14 +72,14 @@ Dibs::Application.routes.draw do
 
        # admin project 
        get "admin_project/queryAllProject" 
-       match "admin_project/queryProjectsInDistributionForAdmin/:distribution" => "admin_project#queryProjectsInDistributionForAdmin" 
+       match "admin_project/queryProjectsInDistributionForAdmin/:distribution" => "admin_project#queryProjectsInDistributionForAdmin", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ }
        post "admin_project/addProject" 
        post "admin_project/removeProject" 
        post "admin_project/modifyProject" 
 
        # admin distribution
        get "admin_distribution/queryAllDistribution" 
-       match "admin_distribution/queryDistributionInfo/:distribution" => "admin_distribution#queryDistributionInfo" 
+       match "admin_distribution/queryDistributionInfo/:distribution" => "admin_distribution#queryDistributionInfo", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ } 
        post "admin_distribution/addDistribution" 
        post "admin_distribution/removeDistribution" 
        post "admin_distribution/modifyDistribution" 

diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html
index 966cefbc3594053bb2391cb1e618160ceb09855f..4a26c6a52f334f7b1630be99b1e50e80df42f6fd 100644 (file)
--- a/dibs-web/public/index.html
+++ b/dibs-web/public/index.html
@@ -27,11 +27,12 @@ Contributors:
 -->
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<html lang="ko">
 <head>
        <title>DIBS 2.0</title>
        
        <meta charset="utf-8">
+       <meta http-equiv="X-UA-Compatible" content="IE=9" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
        <meta name="description" content="A master-detail template generated by Tizen Web IDE"/>
 

diff --git a/dibs-web/public/javascripts/jobs.js b/dibs-web/public/javascripts/jobs.js
index 02a4a2b55d3e45fd2a1f1294fca0ebb0b72fd1b4..0a2b858e1589dbd2b541ce4b5c4e8173b4611e3c 100644 (file)
--- a/dibs-web/public/javascripts/jobs.js
+++ b/dibs-web/public/javascripts/jobs.js
@@ -161,22 +161,22 @@ function searchJob(searchText) {
 
 function selectJobAll() {
        var distribution = $("#jobSelectDistribution option:selected").val(); 
-       $("#jobDivSearchDate").attr("hidden", "true");
-       $("#jobDivSearchInput").attr("hidden", "true");
+       $("#jobDivSearchDate").hide();
+       $("#jobDivSearchInput").hide();
        queryJobListAll(distribution);
 }
 
 function selectJobId() {
-       $("#jobDivSearchDate").attr("hidden", "true");
-       $("#jobDivSearchInput").removeAttr("hidden");
+       $("#jobDivSearchDate").hide();
+       $("#jobDivSearchInput").show();
        $("#jobSearchInputText").val("").textinput();
        clearJobList();
 }
 
 function selectUser() {
        var distribution = $("#jobSelectDistribution option:selected").val(); 
-       $("#jobDivSearchDate").attr("hidden", "true");
-       $("#jobDivSearchInput").removeAttr("hidden");
+       $("#jobDivSearchDate").hide();
+       $("#jobDivSearchInput").show();
 
        var name = sessionStorage.sessionInfoName;
        $("#jobSearchInputText").val(name).textinput();
@@ -186,8 +186,8 @@ function selectUser() {
 
 function selectGroup() {
        var distribution = $("#jobSelectDistribution option:selected").val(); 
-       $("#jobDivSearchDate").attr("hidden", "true");
-       $("#jobDivSearchInput").removeAttr("hidden");
+       $("#jobDivSearchDate").hide();
+       $("#jobDivSearchInput").show();
 
        var group = sessionStorage.sessionInfoGroup;
        $("#jobSearchInputText").val(group).textinput();
@@ -199,8 +199,8 @@ function selectGroup() {
 
 function selectProject() {
        var distribution = $("#jobSelectDistribution option:selected").val(); 
-       $("#jobDivSearchDate").attr("hidden", "true");
-       $("#jobDivSearchInput").removeAttr("hidden");
+       $("#jobDivSearchDate").hide();
+       $("#jobDivSearchInput").show();
        clearJobList();
 
        $("#jobSearchInputText").val("").textinput();
@@ -224,8 +224,8 @@ function selectDate() {
        var date = yyyy+'-'+mm+'-'+dd;
        $('#jobSearchDate').val(date);
 
-       $("#jobDivSearchInput").attr("hidden", "true");
-       $("#jobDivSearchDate").removeAttr("hidden");
+       $("#jobDivSearchInput").hide();
+       $("#jobDivSearchDate").show();
        clearJobList();
        queryJobListDate(distribution, date);
 }
@@ -250,7 +250,8 @@ function queryJobListUserName(distribution, name) {
        var distribution = $("#jobSelectDistribution option:selected").val(); 
        var selectedStatus= $('#jobStatusSelect').find("input[type='radio']:checked").val();
        clearJobList();
-       queryJobList("jobs/listSearchUser/"+name, distribution, selectedStatus, "LATEST");
+       var encodingName = encodeURIComponent(name);
+       queryJobList("jobs/listSearchUser/"+encodingName, distribution, selectedStatus, "LATEST");
 }
 
 function queryJobListUserGroup(distribution, group) {