Merge 7fb67d7 into bb19cec

mozilla · Dec 1, 2014 · 7715155 · 7715155
2 parents bb19cec + 7fb67d7
commit 7715155
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 71 deletions.
diff --git a/migrations/875-cleanup-groups.sql b/migrations/875-cleanup-groups.sql
@@ -0,0 +1,9 @@
+UPDATE groups SET rules='Apps:*,Users:Edit,Stats:View,AdminTools:View,AccountLookup:View,AppLookup:View,Lookup:View,Stats:View' WHERE name='Staff';
+UPDATE groups SET rules='Stats:View' WHERE name='Statistic Viewers';
+UPDATE groups SET rules='Apps:Review' WHERE name='App Reviewers';
+UPDATE groups SET rules='Apps:Review,Apps:Edit,ReviewerAdminTools:View,Apps:ReviewEscalated,Apps:ReviewPrivileged,Apps:ReviewRegionCN' WHERE name='Senior App Reviewers';
+UPDATE groups SET rules='Prices:Edit' WHERE name='Price currency manipulation';
+DELETE FROM groups WHERE name in ('Add-on Reviewers', 'Persona Reviewers', 'Senior Add-on Reviewers',
+       	'Add-on Reviewer MOTD', 'Persona Reviewer MOTD', 'OAuth Partner: Flightdeck',
+       	'Bulk Compatibility Updaters', 'Feature Managers', 'Developers Credits',
+       	'Past Developers Credits', 'Other Contributors Credits');
diff --git a/mkt/site/fixtures/init.json b/mkt/site/fixtures/init.json
@@ -1344,7 +1344,7 @@
             "modified": "2012-04-19T18:43:22",
             "name": "Staff",
             "notes": "",
-            "rules": "Addons:Review,Apps:Review,Personas:Review,Reviews:Edit,Addons:Edit,Addons:Configure,Users:Edit,Stats:View,CollectionStats:View,Collections:Edit,AdminTools:View,Apps:Configure,FeaturedApps:View,FeaturedApps:Edit,Stats:View,Apps:ReviewPrivileged,Apps:Publisher,Apps:ReviewRegionCN,Apps:Edit"
+            "rules": "Apps:*,Users:Edit,Stats:View,AdminTools:View,AccountLookup:View,AppLookup:View,Lookup:View,Stats:View"
         },
         "model": "access.group",
         "pk": 50000
@@ -1355,55 +1355,22 @@
             "modified": "2012-04-04T17:17:55",
             "name": "Statistic Viewers",
             "notes": "",
-            "rules": "Stats:View,CollectionStats:View"
+            "rules": "Stats:View"
         },
         "model": "access.group",
         "pk": 50001
     },
-    {
-        "fields": {
-            "created": "2012-04-04T17:17:55",
-            "modified": "2012-04-04T17:17:55",
-            "name": "Add-on Reviewers",
-            "notes": "",
-            "rules": "Addons:Review,Reviews:Edit"
-        },
-        "model": "access.group",
-        "pk": 50002
-    },
     {
         "fields": {
             "created": "2012-04-04T17:17:55",
             "modified": "2012-04-04T17:17:55",
             "name": "App Reviewers",
             "notes": "",
-            "rules": "Apps:Review,Reviews:Edit"
+            "rules": "Apps:Review"
         },
         "model": "access.group",
         "pk": 50003
     },
-    {
-        "fields": {
-            "created": "2012-04-04T17:17:55",
-            "modified": "2012-04-04T17:17:55",
-            "name": "Persona Reviewers",
-            "notes": "",
-            "rules": "Personas:Review,Reviews:Edit"
-        },
-        "model": "access.group",
-        "pk": 50004
-    },
-    {
-        "fields": {
-            "created": "2012-04-04T17:17:55",
-            "modified": "2012-04-04T17:17:55",
-            "name": "Senior Add-on Reviewers",
-            "notes": "",
-            "rules": "Addons:Review,Reviews:Edit,CollectionStats:View,Addons:Edit,Spam:Flag,ReviewerAdminTools:View"
-        },
-        "model": "access.group",
-        "pk": 50005
-    },
     {
         "fields": {
             "created": "2012-04-04T17:17:58",
@@ -1481,17 +1448,6 @@
         "model": "access.group",
         "pk": 50051
     },
-    {
-        "fields": {
-            "created": "2012-04-04T17:17:58",
-            "modified": "2012-04-04T17:17:58",
-            "name": "Add-on Reviewer MOTD",
-            "notes": "",
-            "rules": "AddonReviewerMOTD:Edit"
-        },
-        "model": "access.group",
-        "pk": 50052
-    },
     {
         "fields": {
             "created": "2012-04-04T17:17:58",
@@ -1503,17 +1459,6 @@
         "model": "access.group",
         "pk": 50053
     },
-    {
-        "fields": {
-            "created": "2012-04-04T17:17:58",
-            "modified": "2012-04-04T17:17:58",
-            "name": "Persona Reviewer MOTD",
-            "notes": "",
-            "rules": "PersonaReviewerMOTD:Edit"
-        },
-        "model": "access.group",
-        "pk": 50054
-    },
     {
         "fields": {
             "created": "2012-05-01T08:47:38",
@@ -1525,17 +1470,6 @@
         "model": "access.group",
         "pk": 50055
     },
-    {
-        "fields": {
-            "created": "2012-05-09T15:40:07",
-            "modified": "2012-05-09T15:40:07",
-            "name": "Bulk Compatibility Updaters",
-            "notes": "",
-            "rules": "BulkValidationAdminTools:View"
-        },
-        "model": "access.group",
-        "pk": 50056
-    },
     {
         "fields": {
             "created": "2012-05-22T17:12:04",
@@ -1564,7 +1498,7 @@
             "modified": "2012-08-08T14:40:41",
             "name": "Senior App Reviewers",
             "notes": "",
-            "rules": "Apps:Review,Reviews:Edit,CollectionStats:View,Addons:Edit,Spam:Flag,ReviewerAdminTools:View,Apps:ReviewEscalated,Apps:ReviewPrivileged,Apps:ReviewRegionCN,Apps:Edit"
+            "rules": "Apps:Review,Apps:Edit,ReviewerAdminTools:View,Apps:ReviewEscalated,Apps:ReviewPrivileged,Apps:ReviewRegionCN"
         },
         "model": "access.group",
         "pk": 50059
@@ -1652,7 +1586,7 @@
             "modified": "2014-04-04T15:43:10",
             "name": "Price currency manipulation",
             "notes": "Clients that can modify prices",
-            "rules": "Prices:Modify"
+            "rules": "Prices:Edit"
         },
         "model": "access.group",
         "pk": 50074