Ticket #3873: warn_permission_exists-r5190.diff

trac/htdocs/css/trac.css

@@ -466 +466 @@
 div.system-message p { margin: 0; }
 div.system-message p.system-message-title { font-weight: bold; }
 
+#warning.system-message { background: #def; border: 2px solid #00d; }
+#warning.system-message li { list-style-type: square; }
+
 #content.error #newticket form { display: inline; }
 #content.error #newticket textarea { display: none; }
 

trac/admin/web_ui.py

@@ -301 +301 @@
                 req.perm.require(action)
                 if (subject, action) not in all_permissions:
                     perm.grant_permission(subject, action)
-                # TODO: else: req.warning('...')
-                req.redirect(req.href.admin(cat, page))
+                    req.redirect(req.href.admin(cat, page))
+                else:
+                    req.warning('Permission "%s" was already granted to '
+                                '"%s"' % (action, subject))
 
             # Add subject to group
             elif req.args.get('add') and subject and group:
@@ -311 +313 @@
                     req.perm.require(action)
                 if (subject,group) not in all_permissions:
                     perm.grant_permission(subject, group)
-                # TODO: else: req.warning('...')
-                req.redirect(req.href.admin(cat, page))
+                    req.redirect(req.href.admin(cat, page))
+                else:
+                    req.warning('"%s" was already added to group "%s"' %
+                                (subject, group))
 
             # Remove permissions action
             elif req.args.get('remove') and req.args.get('sel'):

trac/templates/layout.html

@@ -54 +54 @@
       ${navigation('metanav')}
     </div>
     ${navigation('mainnav')}
+    <div id="warning" py:if="req and req.warnings" class="system-message">
+      <strong>Warning:</strong>
+      <ul><li py:for="w in req.warnings">$w</li></ul>
+    </div>
 
     <div id="main">
       ${select('*|text()')}

trac/web/api.py

@@ -158 +158 @@
         self.href = Href(self.base_path)
         self.abs_href = Href(self.base_url)
 
+        self.warnings = []
+
     def __getattr__(self, name):
         """Performs lazy attribute lookup by delegating to the functions in the
         callbacks dictionary."""
@@ -419 +421 @@
             data = data.encode(self._outcharset or 'utf-8')
         self._write(data)
 
+    def warning(self, msg):
+        self.warnings.append(msg)
+
     # Internal methods
 
     def _parse_args(self):