Bug 278650 : editversions.cgi still uses "auth_cant_edit_versions"

Patch by Frederic Buclin <LpSolit@gmail.com>  r=vladd  a=justdave

diff --git a/editversions.cgi b/editversions.cgi
index 613f2468af827f00350eb3bbbcd892511a69bea6..e4cf47e2a103c7b0e3f7c892711dde3d92343232 100755 (executable)
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -115,11 +115,10 @@ Bugzilla->login(LOGIN_REQUIRED);
 
 print Bugzilla->cgi->header();
 
-unless (UserInGroup("editcomponents")) {
-    ThrowUserError('auth_cant_edit_versions');    
-    exit;
-}
-
+UserInGroup("editcomponents")
+  || ThrowUserError("auth_failure", {group  => "editcomponents",
+                                     action => "edit",
+                                     object => "versions"});
 
 #
 # often used variables

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 5ea789a2fbf88fcb73a983674b7230210f27aec0..e849e78277cf3b9786c7206acfb7ad66f3b3376d 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -218,11 +218,6 @@
      Sorry, but you can not delete the default classification,
      '[% name FILTER html %]'.
 
-  [% ELSIF error == "auth_cant_edit_versions" %]
-    [% title = "Access Denied" %]
-    Sorry, you aren't a member of the 'editcomponents' group, and so
-    you aren't allowed to add, modify or delete versions.
-
   [% ELSIF error == "component_already_exists" %]
     [% title = "Component Already Exists" %]
     A component with the name '[% name FILTER html %]' already exists.