Form resubmission warning on page refresh after warning added when granting permission

[Ryan J Ollos]

The issue appears to have been introduced in #3873 / r5227.

trac/admin/web_ui.py

@@ -389 +389 @@
                     add_notice(req, _("The subject %(subject)s has been "
                                       "granted the permission %(action)s.",
                                       subject=subject, action=action))
-                    req.redirect(req.href.admin(cat, page))
                 else:
                     add_warning(req, _("The permission %(action)s was already "
                                        "granted to %(subject)s.",
                                        action=action, subject=subject))
+                req.redirect(req.href.admin(cat, page))
 
             # Add subject to group
             elif req.args.get('add') and subject and group:
@@ -416 +416 @@
                     add_notice(req, _("The subject %(subject)s has been added "
                                       "to the group %(group)s.",
                                       subject=subject, group=group))
-                    req.redirect(req.href.admin(cat, page))
                 else:
                     add_warning(req, _("The subject %(subject)s was already "
                                        "added to the group %(group)s.",
                                        subject=subject, group=group))
+                req.redirect(req.href.admin(cat, page))
 
             # Remove permissions action
             elif req.args.get('remove') and req.args.get('sel'):

[Ryan J Ollos]

Committed to 1.0-stable in [16338:16340]. I thought changes would be simple but kept discovering more issues on 3rd, 4th … rounds of testing.

I'll revisit in a few days and merge changes if no other issues are found.

[Ryan J Ollos]

Merged to 1.2-stable in r16344, merged to trunk in r16345.

[Ryan J Ollos]

Milestone renamed