Changeset 32f43b in indico for indico/MaKaC/webinterface/wcomponents.py

Timestamp:

03/28/12 17:51:46 (15 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

20016b

Parents:

a20e62

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (03/16/12 17:20:42)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/28/12 17:51:46)

Message:

[IMP] Add protection section in admin

• The disclaimers for restricted and protected are stored in minfo.

File:

• indico/MaKaC/webinterface/wcomponents.py (modified) (2 diffs)

indico/MaKaC/webinterface/wcomponents.py

@@ -317 +317 @@
     def _getProtection(self, target):
         if not target.hasAnyProtection():
-            return ["Public", "Public"]
+            return ["Public", _("Public")]
         if target.isItselfProtected():
-            return ["Restricted", "Restricted"]
+            return ["Restricted", _("Restricted")]
         if target.getDomainList() != []:
-            return ["Protected", "%s domain only"%(", ".join(map(lambda x: x.getName(), target.getDomainList())))]
+            return ["Protected", _("%s domain only")%(", ".join(map(lambda x: x.getName(), target.getDomainList())))]
         return self._getProtection(target.getOwner())
 
@@ -389 +389 @@
         minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
         vars['roomBooking'] = minfo.getRoomBookingModuleActive()
-
+        vars['protectionDisclaimerProtected'] = minfo.getProtectionDisclaimerProtected()
+        vars['protectionDisclaimerRestricted'] = minfo.getProtectionDisclaimerRestricted()
         #Build a list of items for the administration menu
         adminList = AdminList.getInstance()