[Title] status name change

[Type] Enhancement
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I3cbe97d95b3b45646f18c231f2409378a1981ebf

diff --git a/src/build_server/BinaryUploadProject.rb b/src/build_server/BinaryUploadProject.rb
index d2a4819df7ebbaab112880fb5ea008b75769ded4..f653b80dbb1e655af7fb79eedec9b992d8402237 100644 (file)
--- a/src/build_server/BinaryUploadProject.rb
+++ b/src/build_server/BinaryUploadProject.rb
@@ -162,7 +162,7 @@ class BinaryUploadProject < CommonProject
                if is_new then
                        db.do "INSERT INTO project_bins VALUES (#{@prj_id},'#{@pkg_name}')"
                        db.do "INSERT INTO group_project_accesses 
-                               VALUES ( (SELECT groups.id FROM groups WHERE groups.name = 'admin'),'#{@prj_id}','UNLOCK')"
+                               VALUES ( (SELECT groups.id FROM groups WHERE groups.name = 'admin'),'#{@prj_id}','TRUE')"
                else
                        db.do "UPDATE project_bins SET pkg_name='#{@pkg_name}' WHERE project_id=#{@prj_id})"
                end

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index d8eccf8d062301a271d5088436c54721eeeac7bd..3b80c4b11b42ab48ee6df0343d6ca1a8d446a513 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -656,7 +656,7 @@ class BuildServer
                        db.do "CREATE TABLE group_project_accesses( 
                                group_id INTEGER NOT NULL, 
                                project_id INTEGER NOT NULL, 
-                               build VARCHAR(32) NOT NULL DEFAULT 'UNLOCK', 
+                               build VARCHAR(32) NOT NULL DEFAULT 'TRUE', 
                                PRIMARY KEY ( group_id,project_id ),
                                CONSTRAINT fk_groups_has_projects_groups1 FOREIGN KEY ( group_id ) REFERENCES groups ( id ),
                                CONSTRAINT fk_groups_has_projects_projects1 FOREIGN KEY ( project_id ) REFERENCES projects ( id ) )#{post_fix}"

diff --git a/src/build_server/DistributionManager.rb b/src/build_server/DistributionManager.rb
index 5862f8877a0328a6c2b34bcff7ef2bbef1358861..2ef9a2796e669d6178c41879093319eef9db118b 100644 (file)
--- a/src/build_server/DistributionManager.rb
+++ b/src/build_server/DistributionManager.rb
@@ -209,7 +209,7 @@ class DistributionManager
                        dist = get_distribution_internal(name, db)
                        if dist.nil? then return false end
 
-                       dist.status = (value)? "LOCKED" : "OPEN"
+                       dist.status = (value)? "CLOSE" : "OPEN"
                        dist.save(db)
                end
                if result then

diff --git a/src/build_server/GitBuildProject.rb b/src/build_server/GitBuildProject.rb
index be75aab4b99ab2f1e3fca50b017d72c9ad18d316..589651b79f58e1d2be50540222ba5e2b12b839ea 100644 (file)
--- a/src/build_server/GitBuildProject.rb
+++ b/src/build_server/GitBuildProject.rb
@@ -138,7 +138,7 @@ class GitBuildProject < CommonProject
                if is_new then
                        db.do "INSERT INTO project_gits VALUES (#{@prj_id},'#{@repository}','#{@branch}')"
                        db.do "INSERT INTO group_project_accesses 
-                               VALUES ( (SELECT groups.id FROM groups WHERE groups.name = 'admin'),'#{@prj_id}','UNLOCK')"
+                               VALUES ( (SELECT groups.id FROM groups WHERE groups.name = 'admin'),'#{@prj_id}','TRUE')"
                else
                        db.do "UPDATE project_gits SET git_repos='#{@repository}',git_branch='#{@branch}' WHERE project_id=#{@prj_id})"
                end

diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb
index 2a4e9e082c21bcc9ea1e558ea1c035f9a0084407..ece0e9e86afb7fb67c0f2b8ebd08a055322d582a 100644 (file)
--- a/src/build_server/ProjectManager.rb
+++ b/src/build_server/ProjectManager.rb
@@ -179,7 +179,7 @@ class ProjectManager
                                                        WHERE user_groups.user_id = #{user_id} and 
                                                        user_groups.group_id = group_project_accesses.group_id and
                                                        group_project_accesses.project_id = #{prj.get_project_id} and
-                                                       group_project_accesses.build = 'UNLOCK'"
+                                                       group_project_accesses.build = 'TRUE'"
                end
                return (not result.nil?)
        end
@@ -192,7 +192,7 @@ class ProjectManager
                                                        WHERE user_groups.user_id = #{user_id} and 
                                                        user_groups.group_id = group_project_accesses.group_id and
                                                        group_project_accesses.project_id = #{prj.get_project_id} and
-                                                       group_project_accesses.build = 'UNLOCK'"
+                                                       group_project_accesses.build = 'TRUE'"
                end
                return (not result.nil?)
        end