Revert OBS:Maintainer attribute till it's green everywhere

openSUSE · Nov 16, 2012 · 05186b2 · 05186b2
1 parent 3d9fb05
commit 05186b2
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 45 deletions.
diff --git a/src/api/db/migrate/20121114104300_add_maintainer_attrib_type.rb b/src/api/db/migrate/20121114104300_add_maintainer_attrib_type.rb
diff --git a/src/api/db/seeds.rb b/src/api/db/seeds.rb
@@ -78,11 +78,6 @@
 at = AttribType.find_or_create_by_attrib_namespace_id_and_name(ans.id, "ScreenShots")
 at.attrib_type_modifiable_bies.find_or_create_by_bs_user_id(admin.id)
 
-at = AttribType.find_or_create_by_attrib_namespace_id_and_name(ans.id, "Maintainer")
-at.attrib_type_modifiable_bies.find_or_create_by_bs_user_id(admin.id)
-at.allowed_values << AttribAllowedValue.new( :value => "DisableDevel" )
-at.allowed_values << AttribAllowedValue.new( :value => "BugownerOnly" )
-
 at = AttribType.find_or_create_by_attrib_namespace_id_and_name(ans.id, "RequestCloned", :value_count => 1)
 at.attrib_type_modifiable_bies.find_or_create_by_bs_role_id(maintainer_role.id)
 at = AttribType.find_or_create_by_attrib_namespace_id_and_name(ans.id, "ProjectStatusPackageFailComment", :value_count => 1)
@@ -94,6 +89,7 @@
 
 at = AttribType.find_or_create_by_attrib_namespace_id_and_name(ans.id, "QualityCategory", :value_count => 1)
 at.attrib_type_modifiable_bies.find_or_create_by_bs_role_id(maintainer_role.id)
+
 at.allowed_values << AttribAllowedValue.new( :value => "Stable" )
 at.allowed_values << AttribAllowedValue.new( :value => "Testing" )
 at.allowed_values << AttribAllowedValue.new( :value => "Development" )

diff --git a/src/api/db/structure.sql b/src/api/db/structure.sql
@@ -994,8 +994,6 @@ INSERT INTO schema_migrations (version) VALUES ('20121112110642');
 
 INSERT INTO schema_migrations (version) VALUES ('20121114093616');
 
-INSERT INTO schema_migrations (version) VALUES ('20121114104300');
-
 INSERT INTO schema_migrations (version) VALUES ('21');
 
 INSERT INTO schema_migrations (version) VALUES ('22');

diff --git a/src/api/test/fixtures/attrib_allowed_values.yml b/src/api/test/fixtures/attrib_allowed_values.yml
@@ -18,11 +18,3 @@ attrib_allowed_values_67:
   id: 67
   attrib_type_id: 59
   value: neutral
-Maintainer_DisableDevel:
-  id: 77
-  attrib_type_id: 77
-  value: DisableDevel
-Maintainer_BugownerOnly:
-  id: 78
-  attrib_type_id: 77
-  value: BugownerOnly
diff --git a/src/api/test/fixtures/attrib_type_modifiable_bies.yml b/src/api/test/fixtures/attrib_type_modifiable_bies.yml
@@ -79,7 +79,3 @@ attrib_type_modifiable_bies_973674881:
   id: 973674881
   attrib_type_id: 75
   bs_role_id: 3
-attrib_type_modifiable_bies_973674882:
-  id: 973674882
-  attrib_type_id: 77
-  bs_role_id: 1
diff --git a/src/api/test/fixtures/attrib_types.yml b/src/api/test/fixtures/attrib_types.yml
@@ -22,10 +22,6 @@ OBS_Maintained:
   name: Maintained
   value_count: 0
   attrib_namespace_id: 9
-OBS_Maintainer:
-  id: 77
-  name: Maintainer
-  attrib_namespace_id: 9
 OBS_MaintenanceIdTemplate:
   id: 63
   name: MaintenanceIdTemplate

diff --git a/src/api/test/functional/attributes_test.rb b/src/api/test/functional/attributes_test.rb
@@ -30,7 +30,7 @@ def test_namespace_index
 
     get "/attribute/OBS"
     assert_response :success
-    count = 14
+    count = 13
     assert_xml_tag :tag => 'directory', :attributes => { :count => count }
     assert_xml_tag :children => { :count => count }
     assert_xml_tag :child => { :tag => 'entry', :attributes => { :name => "Maintained" } }
@@ -161,7 +161,7 @@ def test_attrib_type_meta
 
     get "/attribute/OBS"
     assert_response :success
-    count = 14
+    count = 13
     assert_xml_tag :tag => 'directory', :attributes => { :count => count }
     assert_xml_tag :children => { :count => count }
     assert_xml_tag :child => { :tag => 'entry', :attributes => { :name => "Maintained" } }