[#8496] skip limit when adding a trove category if the current user is a site admin
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index f49bc6d..1ee723c 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -54,6 +54,7 @@
import six
+
log = logging.getLogger(__name__)
@@ -432,9 +433,10 @@ def _add_trove(self, type, new_trove):
trove_obj = M.TroveCategory.query.get(trove_cat_id=int(new_trove))
error_msg = None
in_trove = False
- if type in ['license', 'audience', 'developmentstatus', 'language'] and len(current_troves) >= 6:
+ if type in ['license', 'audience', 'developmentstatus', 'language'] and len(
+ current_troves) >= 6 and not h.is_site_admin(c.user):
error_msg = 'You may not have more than 6 of this category.'
- elif type in ['topic'] and len(current_troves) >= 3:
+ elif type in ['topic'] and len(current_troves) >= 3 and not h.is_site_admin(c.user):
error_msg = 'You may not have more than 3 of this category.'
elif trove_obj is not None:
in_trove = trove_obj._id in current_troves
