From: dibs Date: Mon, 25 Feb 2013 13:28:46 +0000 (+0900) Subject: [Title] [Dibs web] code refactoring and DB query tunning X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90520b7e20ad5aee8e9c4b97030a9b2e592f44f4;p=sdk%2Ftools%2Fsdk-build.git [Title] [Dibs web] code refactoring and DB query tunning --- diff --git a/dibs-web/app/controllers/admin_controller.rb b/dibs-web/app/controllers/admin_controller.rb index b2803d5..c6ea473 100644 --- a/dibs-web/app/controllers/admin_controller.rb +++ b/dibs-web/app/controllers/admin_controller.rb @@ -31,23 +31,23 @@ class AdminController < ApplicationController before_filter :check_login_status, :check_admin_group def queryAllOS - os_list = SupportedOs.all(:order => "name") + os_list = SupportedOs.find_by_sql("SELECT supported_os.name AS os_name + , os_category.name AS category_name + FROM supported_os + , os_category + WHERE supported_os.os_category_id = os_category.id + ORDER BY supported_os.name") doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { generate_xml_header(doc) doc.Data { - if not os_list.nil? - os_list.each do |os| - doc.OS { - doc.OsName(os.name) - category = OsCategory.find(:first, :conditions => ["id = ?", os.os_category_id]) - if not category.nil? - doc.OsCategory(category.name) - end - } - end + os_list.each do |os| + doc.OS { + doc.OsName(os.os_name) + doc.OsCategory(os.category_name) + } end } } @@ -57,17 +57,15 @@ class AdminController < ApplicationController end def queryAllOSCategory - os_category_list = OsCategory.all(:order => "name") + os_category_list = OsCategory.find(:all, :order => "name") doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { generate_xml_header(doc) doc.Data { - if not os_category_list.nil? - os_category_list.each do |category| - doc.OsCategoryName(category.name) - end + os_category_list.each do |category| + doc.OsCategoryName(category.name) end } } diff --git a/dibs-web/app/controllers/admin_distribution_controller.rb b/dibs-web/app/controllers/admin_distribution_controller.rb index 6d838c6..aa91a87 100644 --- a/dibs-web/app/controllers/admin_distribution_controller.rb +++ b/dibs-web/app/controllers/admin_distribution_controller.rb @@ -30,28 +30,6 @@ class AdminDistributionController < ApplicationController before_filter :check_login_status, :check_admin_group - def queryAllDistribution - # get full distribution list - distributions = Distribution.all - - doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) - doc.Response { - generate_xml_header(doc) - - #generate to XML - doc.Data { - if not distributions.nil? - distributions.each do |distribution| - doc.DistributionName(distribution.name) - end - end - } - } - - #send_data - render :text => out_string, :content_type => "text/xml" - end - def queryDistributionInfo dist_name = params[:distribution] diff --git a/dibs-web/app/controllers/admin_group_controller.rb b/dibs-web/app/controllers/admin_group_controller.rb index 5818e1b..6820593 100644 --- a/dibs-web/app/controllers/admin_group_controller.rb +++ b/dibs-web/app/controllers/admin_group_controller.rb @@ -32,37 +32,36 @@ class AdminGroupController < ApplicationController skip_before_filter :check_admin_group, :only => [:queryAllGroup] def queryAllGroup - project_list = Project.all(:order => "name") - group_list = Group.all + group_list = Group.find(:all) doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { generate_xml_header(doc) doc.Data { - if not group_list.nil? - group_list.each do |group| - group_access_list = GroupProjectAccess.find(:all, :conditions => ["group_id = ?", group.id]) - - doc.Group { - doc.GroupName(group.name) - doc.AdminFlag(group.admin) - doc.Description(group.description) - - if not group_access_list.nil? - group_access_list.each do |group_right| - project = Project.find(:first, :conditions => ["id = ?", group_right.project_id]); - distribution = Distribution.find(:first, :conditions => ["id = ?", project.distribution_id]); - if not project.nil? - doc.AccessableProject { - doc.ProjectName(project.name) - doc.ProjectDistribution(distribution.name) - } - end - end - end - } - end + group_list.each do |group| + doc.Group { + doc.GroupName(group.name) + doc.AdminFlag(group.admin) + doc.Description(group.description) + + project_list = GroupProjectAccess.find_by_sql("SELECT projects.name AS project_name + , distributions.name AS distribution_name + FROM group_project_accesses + , projects + , distributions + WHERE group_project_accesses.group_id = #{group.id} + AND projects.id = group_project_accesses.project_id + AND distributions.id = projects.distribution_id + ORDER BY projects.name") + + project_list.each do |project| + doc.AccessableProject { + doc.ProjectName(project.project_name) + doc.ProjectDistribution(project.distribution_name) + } + end + } end } } @@ -84,37 +83,36 @@ class AdminGroupController < ApplicationController return end - project_list = Project.all(:order => "name") - #generate to XML doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { generate_xml_header(doc) doc.Data { - if not project_list.nil? - project_list.each do |project| - distribution = Distribution.find(:first, :conditions => ["id = ?", project.distribution_id]); - doc.Project{ - doc.Name(project.name) - doc.Id(project.id) - doc.DistName(distribution.name) - } - end + project_list = Project.find_by_sql("SELECT projects.name AS project_name + , projects.id AS project_id + , distributions.name AS distribution_name + FROM projects + , distributions + WHERE distributions.id = projects.distribution_id + ORDER BY projects.name") + + project_list.each do |project| + doc.Project{ + doc.Name(project.project_name) + doc.Id(project.project_id) + doc.DistName(project.distribution_name) + } end doc.Group { - doc.Name(group.name) - group_access_list = GroupProjectAccess.find(:all, :conditions => ["group_id = ?", group.id]) - if not group_access_list.nil? and not group_access_list.empty? - project_id_list = [] - group_access_list.each do |group_right| - project_id_list.push group_right.project_id - end - - doc.ProjectList(project_id_list.join(",")) + project_id_list = [] + group_access_list.each do |group_right| + project_id_list.push group_right.project_id end + + doc.ProjectIdList(project_id_list.join(",")) } } } diff --git a/dibs-web/app/controllers/admin_project_controller.rb b/dibs-web/app/controllers/admin_project_controller.rb index a0f7b72..e125bc6 100644 --- a/dibs-web/app/controllers/admin_project_controller.rb +++ b/dibs-web/app/controllers/admin_project_controller.rb @@ -28,22 +28,25 @@ Contributors: class AdminProjectController < ApplicationController def queryAllProject - project_list = Project.all(:order => "name") + project_list = Project.find_by_sql("SELECT projects.name AS project_name + , projects.id AS project_id + , distributions.name AS distribution_name + FROM projects + , distributions + WHERE distributions.id = projects.distribution_id + ORDER BY projects.name") doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { generate_xml_header(doc) doc.Data { - if not project_list.nil? - project_list.each do |project| - distribution = Distribution.find(:first, :conditions => ["id = ?", project.distribution_id]); - doc.Project{ - doc.Name(project.name) - doc.Id(project.id) - doc.DistName(distribution.name) - } - end + project_list.each do |project| + doc.Project{ + doc.Name(project.project_name) + doc.Id(project.project_id) + doc.DistName(project.distribution_name) + } end } } @@ -81,37 +84,39 @@ class AdminProjectController < ApplicationController WHERE distributions.name = \"#{dist_name}\" AND distributions.id = projects.distribution_id ORDER BY projects.name") - if not project_list.nil? - project_list.each do |project| - doc.Project { - doc.ProjectName(project.name) - doc.Type(project.ptype) + + project_list.each do |project| + doc.Project { + doc.ProjectName(project.name) + doc.Type(project.ptype) - os_list = ProjectOs.find(:all, :conditions => ["project_id = ?", project.id]) - if not os_list.nil? then - os_list.each do |os| - supported_os = SupportedOs.find(:first, :conditions => ["id = ?", os.supported_os_id]) - doc.OS(supported_os.name) - end + os_list = ProjectOs.find_by_sql("SELECT supported_os.name AS name + FROM project_os + , supported_os + WHERE project_os.project_id = #{project.id} + AND project_os.supported_os_id = supported_os.id + ORDER BY supported_os.name") + os_list.each do |os| + doc.OS(os.name) + end + + case project.ptype.upcase + when "GIT" + git = ProjectGit.find(:first, :conditions => ["project_id = ?", project.id]) + if not git.nil? then + doc.GitRepos(git.git_repos) + doc.GitBranch(git.git_branch) end - - case project.ptype.upcase - when "GIT" - git = ProjectGit.find(:first, :conditions => ["project_id = ?", project.id]) - if not git.nil? then - doc.GitRepos(git.git_repos) - doc.GitBranch(git.git_branch) - end - - when "BINARY" - bin = ProjectBin.find(:first, :conditions => ["project_id = ?", project.id]) - if not bin.nil? then - doc.PackageName(bin.pkg_name) - end + + when "BINARY" + bin = ProjectBin.find(:first, :conditions => ["project_id = ?", project.id]) + if not bin.nil? then + doc.PackageName(bin.pkg_name) end - } - end + end + } end + } } diff --git a/dibs-web/app/controllers/admin_server_controller.rb b/dibs-web/app/controllers/admin_server_controller.rb index 8efb20d..35f0d5a 100644 --- a/dibs-web/app/controllers/admin_server_controller.rb +++ b/dibs-web/app/controllers/admin_server_controller.rb @@ -29,8 +29,8 @@ Contributors: class AdminServerController < ApplicationController def queryAllServer # get full distribution list - server_config = Server_config.all - remote_build_servers = RemoteBuildServer.all + server_config = Server_config.find(:all) + remote_build_servers = RemoteBuildServer.find(:all) doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { @@ -38,32 +38,28 @@ class AdminServerController < ApplicationController #generate to XML doc.Data { - if not server_config.nil? - server_config.each do |info| - doc.ServerConfig { - doc.Property( info.property ) - doc.Value( info.value ) - } - end + server_config.each do |info| + doc.ServerConfig { + doc.Property( info.property ) + doc.Value( info.value ) + } end - if not remote_build_servers.nil? - remote_build_servers.each do |server| - doc.RemoteBuildServer { - doc.Address(server.svr_addr) - supported_os = SupportedOs.find(:first, :conditions => ["id = ?", server.supported_os_id]) - if supported_os.nil? - doc.SupportedOS("") - else - doc.SupportedOS(supported_os.name) - end - doc.Status(server.status) - doc.MaxJobCount(server.max_job_count) - doc.WorkingJobCount(server.working_job_count) - doc.WaitingJobCount(server.waiting_job_count) - doc.Description(server.description) - } - end + remote_build_servers.each do |server| + doc.RemoteBuildServer { + doc.Address(server.svr_addr) + supported_os = SupportedOs.find(:first, :conditions => ["id = ?", server.supported_os_id]) + if supported_os.nil? + doc.SupportedOS("") + else + doc.SupportedOS(supported_os.name) + end + doc.Status(server.status) + doc.MaxJobCount(server.max_job_count) + doc.WorkingJobCount(server.working_job_count) + doc.WaitingJobCount(server.waiting_job_count) + doc.Description(server.description) + } end } } diff --git a/dibs-web/app/controllers/admin_user_controller.rb b/dibs-web/app/controllers/admin_user_controller.rb index 7f4af7e..17791c3 100644 --- a/dibs-web/app/controllers/admin_user_controller.rb +++ b/dibs-web/app/controllers/admin_user_controller.rb @@ -31,34 +31,34 @@ class AdminUserController < ApplicationController before_filter :check_login_status, :check_admin_group def queryAllUser - user_list = User.all(:order => "name") + user_list = User.find(:all, :order => "name") doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { generate_xml_header(doc) doc.Data { - if not user_list.nil? - user_list.each do |user| - doc.User { - doc.Name(user.name) - doc.Email(user.email) - doc.GroupList { - group_list = Group.find_by_sql("SELECT groups.name - , groups.admin - , groups.description - FROM users - , user_groups - , groups - WHERE users.id = user_groups.user_id - AND user_groups.group_id = groups.id - AND users.email = \"#{user.email}\"") - group_list.each { |group| - doc.GroupName(group.name) - } - } + user_list.each do |user| + doc.User { + doc.Name(user.name) + doc.Email(user.email) + doc.Id(user.id) + doc.GroupList { + group_list = Group.find_by_sql("SELECT groups.name + , groups.admin + , groups.description + FROM users + , user_groups + , groups + WHERE users.email = \"#{user.email}\" + AND users.id = user_groups.user_id + AND user_groups.group_id = groups.id + ORDER BY users.name") + group_list.each do |group| + doc.GroupName(group.name) + end } - end + } end } } @@ -67,13 +67,55 @@ class AdminUserController < ApplicationController render :text => out_string, :content_type => "text/xml" end + def queryUserInfo + user_id = params[:user_id] + + user = User.find(:first, :conditions => ["id = ?", user_id]) + + doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) + doc.Response { + generate_xml_header(doc) + + doc.Data { + doc.User { + doc.Name(user.name) + doc.Email(user.email) + doc.Id(user.id) + doc.GroupInfo{ + full_group_list = Group.find(:all) + full_group_list.each do |group| + doc.Group { + doc.Name(group.name) + doc.Id(group.id) + } + end + + group_list = Group.find_by_sql("SELECT user_groups.group_id + FROM users + , user_groups + WHERE users.id = #{user.id} + AND users.id = user_groups.user_id") + group_id_list = [] + group_list.each do |group| + group_id_list.push group.group_id + end + doc.GroupIdList(group_id_list.join(",")) + } + } + } + } + + #send_data + render :text => out_string, :content_type => "text/xml" + end + def modifyUser change_user_list = params[:ChangeInfoList] change_item = change_user_list[0] errmsg = "" email = change_item[:Email] - group_name = change_item[:GroupName] + group_id_list = change_item[:GroupIdList].split(",") user_name = change_item[:UserName] if email.nil? or email.empty? @@ -89,29 +131,21 @@ class AdminUserController < ApplicationController end end - if group_name.nil? or group_name.empty? - render :text => "Group name is invalid", :status => 406 - return - else - group = Group.find(:first, :conditions => ["name = ?", group_name]) - if group.nil? - errmsg = "Can't find group information" - render :text => errmsg, :status => 406 - return - end - end - - user.name = user_name + user.name = user_name user.save UserGroup.delete_all(["user_id = ?", user.id]) - user_groups = UserGroup.new - - user_groups.user_id = user.id - user_groups.group_id = group.id - user_groups.status = "ACTIVE" - user_groups.save + if not group_id_list.nil? + group_id_list.each do |group_id| + user_groups = UserGroup.new + + user_groups.user_id = user.id + user_groups.group_id = group_id + user_groups.status = "ACTIVE" + user_groups.save + end + end render :json => { :success => "OK!" } end diff --git a/dibs-web/app/controllers/projects_controller.rb b/dibs-web/app/controllers/projects_controller.rb index 2bb8c94..64796f3 100644 --- a/dibs-web/app/controllers/projects_controller.rb +++ b/dibs-web/app/controllers/projects_controller.rb @@ -132,8 +132,16 @@ class ProjectsController < ApplicationController dist_name = params[:distribution] user_id = get_user_id - distribution = Distribution.find(:first, :conditions => ["name = ?", dist_name]) - projects = Project.find(:all, :conditions => ["distribution_id = ?", distribution.id], :order => "name") + projects = Project.find_by_sql("SELECT projects.name AS project_name + , projects.ptype AS project_type + , projects.id AS project_id + , users.email AS maintainer + FROM projects + , distributions + , users + WHERE distributions.name = \"#{dist_name}\" + AND projects.distribution_id = distributions.id + AND users.id = projects.user_id") #generate to XML doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) @@ -143,28 +151,23 @@ class ProjectsController < ApplicationController doc.ProjectList { projects.each { |project| doc.Project { - doc.Name(project.name) - doc.Type(project.ptype) - maintainer = User.find(:first, :conditions => ["id = ?", project.user_id]) - if not maintainer.nil? - doc.Maintainer(maintainer.email) - else - doc.Maintainer("") - end + doc.Name(project.project_name) + doc.Type(project.project_type) + doc.Maintainer(project.maintainer) - if checkUserAccessProject(user_id, project.id) + if checkUserAccessProject(user_id, project.project_id) doc.GroupAccess("TRUE") else doc.GroupAccess("FALSE") end - os_list = ProjectOs.find(:all, :conditions => ["project_id = ?", project.id], :order => "supported_os_id") + os_list = ProjectOs.find(:all, :conditions => ["project_id = ?", project.project_id], :order => "supported_os_id") os_list.each { |os| doc.ProjectOs { os_info = SupportedOs.find(:first, :conditions => ["id = ?", os.supported_os_id]) doc.OsName(os_info.name) - source = queryPackageInfo(project.id, os.supported_os_id) + source = queryPackageInfo(project.project_id, os.supported_os_id) if source.nil? doc.Package { doc.PackageName() @@ -205,20 +208,20 @@ class ProjectsController < ApplicationController dist_name = params[:distribution] running_project_list = Project.find_by_sql("SELECT projects.name - , projects.ptype - , jobs.status - , supported_os.name AS os_name - FROM jobs - , projects - , supported_os - , distributions - WHERE jobs.project_id = projects.id - AND distributions.name = \"#{dist_name}\" - AND projects.distribution_id = distributions.id - AND NOT jobs.status in ('FINISHED', 'ERROR', 'CANCELED') - AND supported_os.id = jobs.supported_os_id - ORDER BY jobs.id") - + , projects.ptype + , jobs.status + , supported_os.name AS os_name + FROM jobs + , projects + , supported_os + , distributions + WHERE jobs.project_id = projects.id + AND distributions.name = \"#{dist_name}\" + AND projects.distribution_id = distributions.id + AND NOT jobs.status in ('FINISHED', 'ERROR', 'CANCELED') + AND supported_os.id = jobs.supported_os_id + ORDER BY jobs.id") + #generate to XML doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) doc.Response { @@ -258,24 +261,7 @@ class ProjectsController < ApplicationController projects = Project.find(:all, :conditions => ["distribution_id = ?", distribution.id], :order => "name") osList = SupportedOs.find(:all) - # check can build - project_access_list = [] - - # get all my project - group_list = get_group_list(get_user_email) - - group_id_list = [] - group_list.each { |group| - group_id_list.push group.id - } - - group_name_list_string = - group_access_project_list = GroupProjectAccess.find(:all, :conditions => ["group_id in (?)", group_id_list.join(",") ]) - if not group_access_project_list.nil? - group_access_project_list.each do |access_project| - project_access_list.push access_project.project_id - end - end + user_id = get_user_id #generate to XML doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) @@ -293,7 +279,7 @@ class ProjectsController < ApplicationController projects.each do |project| if project.ptype.eql? "BINARY" bin = ProjectBin.find(:first, :conditions => ["project_id = ?", project.id]) - if project_access_list.include? project.id + if checkUserAccessProject(user_id, project.id) doc.BinaryProject { doc.ProjectName(project.name) if not bin.nil? then @@ -317,7 +303,7 @@ class ProjectsController < ApplicationController buildOsNameList.push(supported_os.name) end - if project_access_list.include? project.id + if checkUserAccessProject(user_id, project.id) doc.Project { doc.ProjectName(project.name) doc.OsList(buildOsNameList.join(",")) @@ -340,13 +326,8 @@ class ProjectsController < ApplicationController end def queryDistribution - distribution_list = [] - # get full distribution list - distributions = Distribution.all - distributions.each {|distribution| - distribution_list.push distribution.name - } + distribution_list = Distribution.find(:all) #generate to XML doc = Builder::XmlMarkup.new( :target => out_string = "", :indent => 2 ) @@ -354,10 +335,8 @@ class ProjectsController < ApplicationController generate_xml_header(doc) doc.Data { - if not distribution_list.nil? - distribution_list.each do |distribution| - doc.DistributionName(distribution) - end + distribution_list.each do |distribution| + doc.DistributionName(distribution.name) end } } diff --git a/dibs-web/app/controllers/utils.rb b/dibs-web/app/controllers/utils.rb index b0e5f4b..32f332e 100644 --- a/dibs-web/app/controllers/utils.rb +++ b/dibs-web/app/controllers/utils.rb @@ -111,6 +111,7 @@ puts "[[[#{cmd}]]]" options = "-n #{server_name} --dist #{dist_name} " cmd = "#{dibs_path}/build-svr fullbuild #{options}" + cmd = "which ruby" puts "Fullbuild command" puts "[[[#{cmd}]]]" return execute_shell_return(cmd) @@ -121,8 +122,8 @@ puts "[[[#{cmd}]]]" ret = false # get result - IO.popen("#{cmd}") - #system "#{cmd}" + #IO.popen("#{cmd}") + system "#{cmd}" return true end diff --git a/dibs-web/config/application.rb b/dibs-web/config/application.rb index 1e8680c..fd10b4f 100644 --- a/dibs-web/config/application.rb +++ b/dibs-web/config/application.rb @@ -58,5 +58,6 @@ module Dibs # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' + end end diff --git a/dibs-web/config/database.yml b/dibs-web/config/database.yml deleted file mode 100644 index 319f61e..0000000 --- a/dibs-web/config/database.yml +++ /dev/null @@ -1,46 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# development: -# adapter: sqlite3 -# database: db/development.sqlite3 -# pool: 5 -# timeout: 5000 -# -# # Warning: The database defined as "test" will be erased and -# # re-generated from your development database when you run "rake". -# # Do not set this db to the same as development or production. - test: - adapter: - encoding: - host: - port: - database: - username: - password: - pool: - timeout: - - production: - adapter: - encoding: - host: - port: - database: - username: - password: - pool: - timeout: - - development: - adapter: - encoding: - host: - port: - database: - username: - password: - pool: - timeout: diff --git a/dibs-web/config/routes.rb b/dibs-web/config/routes.rb index 5d0385e..b9b9e8d 100644 --- a/dibs-web/config/routes.rb +++ b/dibs-web/config/routes.rb @@ -27,7 +27,6 @@ Contributors: =end Dibs::Application.routes.draw do - root :to => "sessions#new" get "sessions/new" => "sessions#new" @@ -83,6 +82,7 @@ Dibs::Application.routes.draw do # admin user get "admin_user/queryAllUser" + get "admin_user/queryUserInfo/:user_id" => "admin_user#queryUserInfo" post "admin_user/removeUser" post "admin_user/modifyUser" @@ -109,7 +109,6 @@ Dibs::Application.routes.draw do post "admin_project/modifyProject" # admin distribution - get "admin_distribution/queryAllDistribution" match "admin_distribution/queryDistributionInfo/:distribution" => "admin_distribution#queryDistributionInfo", :constraints => { :distribution => /[0-9A-Za-z\-\.\_]+/ } post "admin_distribution/addDistribution" post "admin_distribution/removeDistribution" diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html index e132087..76ba4e1 100644 --- a/dibs-web/public/index.html +++ b/dibs-web/public/index.html @@ -98,11 +98,11 @@ Contributors:

Log in

-
- - - - + + + + +
Cancel @@ -112,40 +112,28 @@ Contributors:
-
+

Sign up

- - - - - - - - - -
-
+ + + + + + + + +
Cancel Sign up
-

-

-
-
-

-
-
-
-
-
Home @@ -157,21 +145,22 @@ Contributors:
-

-
-
- - - - - - - - - +
+
+
+ + + + + + + + +

@@ -198,38 +187,28 @@ Contributors:
-
-
+

Git project

- +
-
+

Binary project

- +
-
@@ -249,73 +228,72 @@ Contributors:
-
-

-
+
- - + + - - + + - - + + - - + + - - + + - - + +
-
+
- - + + - - + + - - + + - - + +
-
-
- +
+ Search -
    +
-
- +
+ Search

-
    +

    - +
@@ -325,15 +303,6 @@ Contributors:
-
- -
-
- - -
-
-
Home @@ -346,7 +315,7 @@ Contributors:

User information

- +
@@ -358,29 +327,28 @@ Contributors:
-
+

Modify User

- - + +
- - + +
-
- +
+
+

-

- Save + Save
@@ -396,10 +364,10 @@ Contributors:

Group information

- +
@@ -469,7 +437,7 @@ Contributors:

Project information

-
@@ -478,19 +446,19 @@ Contributors:
@@ -517,7 +485,7 @@ Contributors:

Distribution information

-
@@ -525,29 +493,29 @@ Contributors:

Package server url

-

+

Package server address

-

+

Status

-

+

Description

-

+

@@ -560,38 +528,38 @@ Contributors:
-
+

Add Distribution

- - + +
- - + +
- - + +
- -
- - + +

Sync package server

- - - - - - + + + + + +
@@ -600,33 +568,33 @@ Contributors:
-
+

Modofy Distribution

- - + +
- - + +
- -
- - + +

Sync package server

- - - - - - + + + + + +
@@ -635,26 +603,26 @@ Contributors:
-
+

Add Git Project

- - + +
- - + +
- - + +
- - + +
-
+

@@ -665,22 +633,22 @@ Contributors:
-
+

Add Binary Project

- - + +
- - + +
- - + +
-
+

@@ -691,33 +659,24 @@ Contributors:
-
+

Modify Project

- +
- - + +
-
- -
- -
+ +
- - -
- - + +
-
+

@@ -728,37 +687,28 @@ Contributors:
-
+

Modify Project

- +
- - + +
-
- -
- -
-
- - + +
- - + +
- - + +
-
+

@@ -769,29 +719,29 @@ Contributors:
-
+

Add Group

- - + +
- +
-

- - + +
-
+

@@ -802,28 +752,29 @@ Contributors:
-
+

modify Group

- - - + +
+ +
- +
-

- - + +
-
+

@@ -841,10 +792,10 @@ Contributors:
- +
- +
@@ -857,13 +808,13 @@ Contributors:
- +
- +
- +
@@ -872,23 +823,23 @@ Contributors:
-
+

User information

- - + +
- - + +
- - + +
- - + +
@@ -903,12 +854,12 @@ Contributors:
- +

-
@@ -924,14 +875,14 @@ Contributors:
- + - +

-
@@ -949,7 +900,7 @@ Contributors:
- +
@@ -966,7 +917,7 @@ Contributors:

-
@@ -982,10 +933,10 @@ Contributors:
- +
- +
@@ -999,10 +950,10 @@ Contributors:
- +
- +
diff --git a/dibs-web/public/javascripts/admin-distribution-add.js b/dibs-web/public/javascripts/admin-distribution-add.js index f648638..9ea84ca 100644 --- a/dibs-web/public/javascripts/admin-distribution-add.js +++ b/dibs-web/public/javascripts/admin-distribution-add.js @@ -29,15 +29,15 @@ Contributors: function adminDistributionAdd() { var changeInfoList = []; var changeInfoItem; - var name = document.getElementById("adminDistributionAddPopup-DistirubtionName").value; - var url = document.getElementById("adminDistributionAddPopup-PackageServerUrl").value; - var address = document.getElementById("adminDistributionAddPopup-PackageServerAddress").value; - var description = document.getElementById("adminDistributionAddPopup-DistributionDescription").value; - var distStatus = $("#adminDistributionAddPopup-DistributionStatus option:selected").val(); + var name = $("#adminDistributionAdd-name").val(); + var url = $("#adminDistributionAdd-url").val(); + var address = $("#adminDistributionAdd-address").val(); + var description = $("#adminDistributionAdd-description").val(); + var distStatus = $("#adminDistributionAdd-status option:selected").val(); - var sync_pkg_svr_url = document.getElementById("adminDistributionAddPopup-SyncPackageServer-Url").value; - var sync_pkg_svr_period = document.getElementById("adminDistributionAddPopup-SyncPackageServer-period").value; - var sync_pkg_svr_description = document.getElementById("adminDistributionAddPopup-SyncPackageServer-Description").value; + var sync_pkg_svr_url = $("#adminDistributionAdd-syncPackageServer-url").val(); + var sync_pkg_svr_period = $("#adminDistributionAdd-syncPackageServer-period").val(); + var sync_pkg_svr_description = $("#adminDistributionAdd-syncPackageServer-description").val(); if(name == "" || url == "" || address == ""){ alert("You must input full data"); @@ -48,13 +48,13 @@ function adminDistributionAdd() { changeInfoList.push(changeInfoItem); addDistribution(changeInfoList, function () { - document.getElementById("adminDistributionAddPopup-DistirubtionName").value = ""; - document.getElementById("adminDistributionAddPopup-PackageServerUrl").value = ""; - document.getElementById("adminDistributionAddPopup-PackageServerAddress").value = ""; - document.getElementById("adminDistributionAddPopup-DistributionDescription").value = ""; - document.getElementById("adminDistributionAddPopup-SyncPackageServer-Url").value = ""; - document.getElementById("adminDistributionAddPopup-SyncPackageServer-period").value = ""; - document.getElementById("adminDistributionAddPopup-SyncPackageServer-Description").value = ""; + $("#adminDistributionAdd-name").val(""); + $("#adminDistributionAdd-url").val(""); + $("#adminDistributionAdd-address").val(""); + $("#adminDistributionAdd-description").val(""); + $("#adminDistributionAdd-syncPackageServer-url").val(""); + $("#adminDistributionAdd-syncPackageServer-period").val(""); + $("#adminDistributionAdd-syncPackageServer-description").val(""); $.mobile.changePage("#adminDistribution"); }); diff --git a/dibs-web/public/javascripts/admin-distribution-modify.js b/dibs-web/public/javascripts/admin-distribution-modify.js index 5c5c293..679e46a 100644 --- a/dibs-web/public/javascripts/admin-distribution-modify.js +++ b/dibs-web/public/javascripts/admin-distribution-modify.js @@ -27,15 +27,15 @@ Contributors: */ function adminDistributionModifyPopupInit() { - var distName = $("#adminDistributionSelect option:selected").val(); - var packageServerUrl = document.getElementById("adminDistribution:packageServerUrl").innerHTML; - var packageServeraddress = document.getElementById("adminDistribution:packageServerAddress").innerHTML; - var serverStatusText = document.getElementById("adminDistribution:distributionStatus").innerHTML; - var serverDescription = document.getElementById("adminDistribution:distributionDescription").innerHTML; + var distName = $("#adminDistribution-distribution-select option:selected").val(); + var packageServerUrl = $("#adminDistribution-url").html(); + var packageServeraddress = $("#adminDistribution-address").html(); + var serverStatusText = $("#adminDistribution-status").html(); + var serverDescription = $("#adminDistribution-description").html(); - var syncPkgSvrUrl = document.getElementById("adminDistribution-SyncPackageServer-Url").innerHTML; - var syncPkgSvrPeriod = document.getElementById("adminDistribution-SyncPackageServer-period").innerHTML; - var syncPkgSvrDescription = document.getElementById("adminDistribution-SyncPackageServer-Description").innerHTML; + var syncPkgSvrUrl = $("#adminDistribution-syncPackageServer-url").html(); + var syncPkgSvrPeriod = $("#adminDistribution-syncPackageServer-period").html(); + var syncPkgSvrDescription = $("#adminDistribution-syncPackageServer-description").html(); if (syncPkgSvrUrl) { syncPkgSvrUrl = syncPkgSvrUrl.replace("Package server url : ", ""); @@ -54,42 +54,42 @@ function adminDistributionModifyPopupInit() { syncPkgSvrDescription = "" } - document.getElementById('adminDistributionModifyPopup-PackageServerUrl').value = packageServerUrl; - document.getElementById('adminDistributionModifyPopup-PackageServerAddress').value = packageServeraddress; - document.getElementById('adminDistributionModifyPopup-Description').value = serverDescription; - document.getElementById('adminDistributionModifyPopup-SyncPackageServer-Url').value = syncPkgSvrUrl; - document.getElementById('adminDistributionModifyPopup-SyncPackageServer-Period').value = syncPkgSvrPeriod; - document.getElementById('adminDistributionModifyPopup-SyncPackageServer-Description').value = syncPkgSvrDescription; + $("#adminDistributionModify-url").val(packageServerUrl); + $("#adminDistributionModify-address").val(packageServeraddress); + $("#adminDistributionModify-description").val(serverDescription); + $("#adminDistributionModify-syncPackageServer-url").val(syncPkgSvrUrl); + $("#adminDistributionModify-syncPackageServer-period").val(syncPkgSvrPeriod); + $("#adminDistributionModify-syncPackageServer-description").val(syncPkgSvrDescription); - $("#adminDistributionModifyPopup-Status").empty(); + $("#adminDistributionModify-status").empty(); var option; if(serverStatusText.toUpperCase() == "OPEN") { option = ''; } else { option = ''; } - $("#adminDistributionModifyPopup-Status").append(option); + $("#adminDistributionModify-status").append(option); if(serverStatusText.toUpperCase() == "CLOSE") { option = ''; } else { option = ''; } - $("#adminDistributionModifyPopup-Status").append(option); - $("#adminDistributionModifyPopup-Status").selectmenu("refresh"); + $("#adminDistributionModify-status").append(option); + $("#adminDistributionModify-status").selectmenu("refresh"); } function adminDistributionModify() { var changeInfoList = []; var changeInfoItem; - var distName = $("#adminDistributionSelect option:selected").val(); - var url = document.getElementById("adminDistributionModifyPopup-PackageServerUrl").value; - var address = document.getElementById("adminDistributionModifyPopup-PackageServerAddress").value; - var description = document.getElementById("adminDistributionModifyPopup-Description").value; - var distStatus = $("#adminDistributionModifyPopup-Status option:selected").val(); - var syncPkgSvrUrl = document.getElementById("adminDistributionModifyPopup-SyncPackageServer-Url").value; - var syncPkgSvrPeriod = document.getElementById("adminDistributionModifyPopup-SyncPackageServer-Period").value; - var syncPkgSvrDescription = document.getElementById("adminDistributionModifyPopup-SyncPackageServer-Description").value; + var distName = $("#adminDistribution-distribution-select option:selected").val(); + var url = $("#adminDistributionModify-url").val(); + var address = $("#adminDistributionModify-address").val(); + var description = $("#adminDistributionModify-description").val(); + var distStatus = $("#adminDistributionModify-status option:selected").val(); + var syncPkgSvrUrl = $("#adminDistributionModify-syncPackageServer-url").val(); + var syncPkgSvrPeriod = $("#adminDistributionModify-syncPackageServer-period").val(); + var syncPkgSvrDescription = $("#adminDistributionModify-syncPackageServer-description").val(); if(distName == "" || url == "" || address == ""){ alert("You must input full data"); diff --git a/dibs-web/public/javascripts/admin-distribution.js b/dibs-web/public/javascripts/admin-distribution.js index 12e112b..7fd24de 100644 --- a/dibs-web/public/javascripts/admin-distribution.js +++ b/dibs-web/public/javascripts/admin-distribution.js @@ -27,32 +27,32 @@ Contributors: */ function adminDistributionInit() { - queryAllDistribution( function (xml) { - var oldDistName = $("#adminDistributionSelect option:selected").val(); + queryDistribution( function (xml) { + var oldDistName = $("#adminDistribution-distribution-select option:selected").val(); var find = false; var distributionList = $(xml).find("Data").find("DistributionName"); // remove old select options - $("#adminDistributionSelect").empty(); + $("#adminDistribution-distribution-select").empty(); distributionList.each(function(){ var name = $(this).text(); if( oldDistName == name ) { - $("#adminDistributionSelect").append(""); + $("#adminDistribution-distribution-select").append(""); find = true; } else { - $("#adminDistributionSelect").append(""); + $("#adminDistribution-distribution-select").append(""); } }); /* default distribution selection */ if(!find) { - $("#adminDistributionSelect option:eq(0)").attr("selected", "selected"); + $("#adminDistribution-distribution-select option:eq(0)").attr("selected", "selected"); } - $("#adminDistributionSelect").selectmenu('refresh'); + $("#adminDistribution-distribution-select").selectmenu('refresh'); // set distribution info adminDistributionSetInfo(); @@ -60,7 +60,7 @@ function adminDistributionInit() { } function adminDistributionSetInfo() { - var distName = $("#adminDistributionSelect option:selected").val(); + var distName = $("#adminDistribution-distribution-select option:selected").val(); queryDistributionInfo( distName, function (xml) { var data = $(xml).find("Data").find("DistributionInfo"); @@ -71,10 +71,10 @@ function adminDistributionSetInfo() { var distStatus = data.find("Status").text(); var distDescription = data.find("Description").text(); - $("#adminDistribution\\:packageServerUrl").text(url); - $("#adminDistribution\\:packageServerAddress").text(address); - $("#adminDistribution\\:distributionStatus").text(distStatus); - $("#adminDistribution\\:distributionDescription").text(distDescription); + $("#adminDistribution-url").text(url); + $("#adminDistribution-address").text(address); + $("#adminDistribution-status").text(distStatus); + $("#adminDistribution-description").text(distDescription); adminDistributionInitSyncPackageServer(syncPackageServer); }); @@ -83,7 +83,7 @@ function adminDistributionSetInfo() { function adminDistributionRemove() { var changeInfoList = []; var changeInfoItem; - var distName = $("#adminDistributionSelect option:selected").val(); + var distName = $("#adminDistribution-distribution-select option:selected").val(); changeInfoItem = {"DistributionName":distName}; changeInfoList.push(changeInfoItem); @@ -100,19 +100,19 @@ function adminDistributionRemove() { } function adminDistributionInitSyncPackageServer(serverInfo){ - $("#adminDistribution-SyncPackageServer").empty(); + $("#adminDistribution-syncPackageServer").empty(); - var info = '

Package server url : '+serverInfo.find("Url").text()+'

'; - info += '

Period : '+serverInfo.find("Period").text()+'

'; - info += '

Description : '+serverInfo.find("Description").text()+'

'; + var info = '

Package server url : '+serverInfo.find("Url").text()+'

'; + info += '

Period : '+serverInfo.find("Period").text()+'

'; + info += '

Description : '+serverInfo.find("Description").text()+'

'; - $("#adminDistribution-SyncPackageServer").append(info); + $("#adminDistribution-syncPackageServer").append(info); } function adminDistributionFullBuild() { var changeInfoList = []; var changeInfoItem; - var distName = $("#adminDistributionSelect option:selected").val(); + var distName = $("#adminDistribution-distribution-select option:selected").val(); changeInfoItem = {"DistributionName":distName}; changeInfoList.push(changeInfoItem); diff --git a/dibs-web/public/javascripts/admin-group-add.js b/dibs-web/public/javascripts/admin-group-add.js index 60c7a16..9811bd6 100644 --- a/dibs-web/public/javascripts/admin-group-add.js +++ b/dibs-web/public/javascripts/admin-group-add.js @@ -27,8 +27,8 @@ Contributors: */ function adminGroupAddInit() { - document.getElementById('adminGroupAddPopup-Name').value = ""; - document.getElementById('adminGroupAddPopup-Description').value = ""; + $("#adminGroupAdd-name").val(""); + $("#adminGroupAdd-description").val(""); queryAllProject( function(xml) { var fullProjectList = $(xml).find("Data").find("Project"); @@ -38,60 +38,37 @@ function adminGroupAddInit() { } function adminGroupAddGenerateProjectSelect(projectList) { - fieldset = document.getElementById('popup:addProjectCheckbox'); - - /* remove all table rows */ - while(fieldset.hasChildNodes()) - { - fieldset.removeChild(fieldset.firstChild); - } - - legend = document.createElement('legend'); - legend.innerHTML = "Project list"; - fieldset.appendChild(legend); + $("#adminGroupAdd-project").empty(); projectList.each(function(){ var projectName = $(this).find("Name").text(); var projectId = $(this).find("Id").text(); var projectDistName = $(this).find("DistName").text(); - var input = document.createElement('input'); - input.type = 'checkbox'; - input.id = 'popup:addGroupProjectCheckbox:'+projectId; - input.name = 'popup:addGroupProjectCheckbox'; - input.value = projectName; - - var label = document.createElement('label'); - label.setAttribute('for', 'popup:addGroupProjectCheckbox:'+projectId); - label.innerHTML = projectName + "[" + projectDistName + "]"; - - fieldset.appendChild(input); - fieldset.appendChild(label); + var input = ''; + var label = '
- +