Changeset 372

Timestamp:

02/04/2014 10:08:20 PM (11 years ago)

Author:

nacin

Message:

Trac: Define bug gardeners by a more specific permission.

Location:

sites/trunk/trac.wordpress.org

Files:

• conf/notifications.ini (modified) (1 diff)
• conf/workflow-core.ini (modified) (5 diffs)
• templates/site.html (modified) (5 diffs)

sites/trunk/trac.wordpress.org/conf/notifications.ini

@@ -1 +1 @@
 [blackmagic]
-cc.hide = true
+cc.disable = true
 
 [components]

sites/trunk/trac.wordpress.org/conf/workflow-core.ini

@@ -14 +14 @@
 assign = new -> assigned
 assign.operations = set_owner
-assign.permissions = TICKET_ADMIN
+assign.permissions = TICKET_EDIT_DESCRIPTION
 assign.default = -10
 
 reassign = assigned,accepted,reopened -> assigned
 reassign.operations = set_owner
-reassign.permissions = TICKET_ADMIN
+reassign.permissions = TICKET_EDIT_DESCRIPTION
 reassign.default = -10
 
 accept = new,reviewing,assigned,accepted,reopened -> accepted
 accept.operations = set_owner_to_self
-accept.permissions = TICKET_ADMIN
+accept.permissions = TICKET_EDIT_DESCRIPTION
 accept.default = -11
 
 review = new,assigned,reopened -> reviewing
 review.operations = set_owner
-review.permissions = TICKET_ADMIN
+review.permissions = TICKET_EDIT_DESCRIPTION
 review.default = -12
 
@@ -35 +35 @@
 reassign_reviewing.name = reassign review
 reassign_reviewing.operations = set_owner
-reassign_reviewing.permissions = TICKET_ADMIN
+reassign_reviewing.permissions = TICKET_EDIT_DESCRIPTION
 reassign_reviewing.default = -12
 
@@ -58 +58 @@
 fix.name = close
 fix.operations = set_resolution
-fix.permissions = TICKET_ADMIN
+fix.permissions = TICKET_EDIT_DESCRIPTION
 fix.set_resolution = fixed
 fix.default = -23
@@ -75 +75 @@
 change_resolution.name = change the resolution, set
 change_resolution.operations = set_resolution
-change_resolution.permissions = TICKET_ADMIN
+change_resolution.permissions = TICKET_EDIT_DESCRIPTION
 change_resolution.default = -31
 
@@ -81 +81 @@
 change_to_duplicate.name = mark as duplicate of #
 change_to_duplicate.operations = set_duplicate
-change_to_duplicate.permissions = TICKET_ADMIN
+change_to_duplicate.permissions = TICKET_EDIT_DESCRIPTION
 change_to_duplicate.default = -32

sites/trunk/trac.wordpress.org/templates/site.html

@@ -8 +8 @@
     project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
     wporg_endpoint = '//make.wordpress.org/core/'
+    is_bug_gardener = 'TICKET_EDIT_DESCRIPTION' in perm(resource)
 
     if project_slug == 'core':
@@ -59 +60 @@
             fields_map[ fields[i]['name'] ] = i
 ?>
-
-<script type="text/javascript" charset="utf-8" src="/chrome/common/js/jquery.js"></script>
 
 <!--! styles and such -->
@@ -166 +165 @@
 
     <!--! force non-gardeners to preview before posting -->
-    <py:if test="not ( 'TICKET_ADMIN' in perm(resource) or 'Bug Gardener' in perm(resource) ) and not 'preview' in req.args">
+    <py:if test="not is_bug_gardener and not 'preview' in req.args">
         <py:match path="form[@id='propertyform']/div[@class='buttons']" once="true">
             <div py:attrs="select('@*')">
@@ -204 +203 @@
 
 <!--! Remove 'Replace existing attachment of the same name' checkbox for non-gardeners -->
-<py:if test="not ( 'TICKET_ADMIN' in perm(resource) or 'Bug Gardener' in perm(resource) )">
+<py:if test="not is_bug_gardener">
     <py:match path="form[@id='attachment']//div[@class='options']" py:strip="" />
 </py:if>
@@ -293 +292 @@
     <xi:include href="wporg-footer.html" />
 
-    <script py:if="'TICKET_ADMIN' in perm(resource) or 'Bug Gardener' in perm(resource)">
+    <script py:if="is_bug_gardener">
     var wpBugGardener = true;
     </script>