Changeset 32f43b in indico

Timestamp:

03/28/12 17:51:46 (14 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, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

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.

Location:

indico

Files:

• MaKaC/common/info.py (modified) (3 diffs)
• MaKaC/services/implementation/admin.py (modified) (3 diffs)
• MaKaC/webinterface/pages/admins.py (modified) (2 diffs)
• MaKaC/webinterface/rh/admins.py (modified) (1 diff)
• MaKaC/webinterface/tpls/AdminProtection.tpl (added)
• MaKaC/webinterface/tpls/ProtectionWidget.tpl (modified) (2 diffs)
• MaKaC/webinterface/tpls/SessionBar.tpl (modified) (1 diff)
• MaKaC/webinterface/urlHandlers.py (modified) (1 diff)
• MaKaC/webinterface/wcomponents.py (modified) (2 diffs)
• htdocs/adminProtection.py (added)

indico/MaKaC/common/info.py

@@ -30 +30 @@
 DEFAULT_API_USER_AGREEMENT = """In order to enable an iCal export link, your account needs to have a key created. This key enables other applications to access data from within Indico even when you are neither using nor logged into the Indico system yourself with the link provided. Once created, you can manage your key at any time by going to 'My Profile' and looking under the tab entitled 'HTTP API'. Further information about HTTP API keys can be found in the Indico documentation."""
 DEFAULT_PERSISTENT_USER_AGREEMENT = """In conjunction with a having a key associated with your account, to have the possibility of exporting private event information necessitates the creation of a persistent key.  This new key is also associated with your account and whilst it is active the data which can be obtained through using this key can be obtained by anyone in possession of the link provided. Due to this reason, it is extremely important that you keep links generated with this key private and for your use only. If you think someone else may have acquired access to a link using this key in the future, you must immediately remove it from 'My Profile' under the 'HTTP API' tab and generate a new key before regenerating iCalendar links."""
+DEFAULT_PROTECTION_DISCLAINER_RESTRICTED = 'Circulation to people other than the intended audience is not authorized. You are obliged to treat the information with the appropriate level of confidentiality.'
+DEFAULT_PROTECTION_DISCLAINER_PROTECTED = 'As such, this information is intended for an internal audience only. You are obliged to treat the information with the appropriate level of confidentiality.'
 
 #from MaKaC.common.logger import Logger
@@ -105 +107 @@
         self._apiPersistentUserAgreement = DEFAULT_PERSISTENT_USER_AGREEMENT
 
+        self._protectionDisclaimerRestricted = DEFAULT_PROTECTION_DISCLAINER_RESTRICTED
+        self._protectionDisclaimerProtected = DEFAULT_PROTECTION_DISCLAINER_PROTECTED
+
 
     def getStyleManager( self ):
@@ -511 +516 @@
     def setAPIPersistentUserAgreement(self, v):
         self._apiPersistentUserAgreement = v
+
+    def getProtectionDisclaimerProtected(self):
+        if not hasattr(self, '_protectionDisclaimerProtected'):
+            self._protectionDisclaimerProtected = DEFAULT_PROTECTION_DISCLAINER_PROTECTED
+        return self._protectionDisclaimerProtected
+
+    def setProtectionDisclaimerProtected(self, v):
+        self._protectionDisclaimerProtected = v
+
+    def getProtectionDisclaimerRestricted(self):
+        if not hasattr(self, '_protectionDisclaimerRestricted'):
+            self._protectionDisclaimerRestricted = DEFAULT_PROTECTION_DISCLAINER_RESTRICTED
+        return self._protectionDisclaimerRestricted
+
+    def setProtectionDisclaimerRestricted(self, v):
+        self._protectionDisclaimerRestricted = v
 
 

indico/MaKaC/services/implementation/admin.py

@@ -18 +18 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-from MaKaC.services.implementation.base import AdminService
+from MaKaC.services.implementation.base import AdminService, TextModificationBase
+
 from MaKaC.services.implementation.base import ParameterManager
 from MaKaC.user import PrincipalHolder, AvatarHolder, GroupHolder
@@ -190 +191 @@
         return userFossil
 
+class EditProtectionDisclaimerProtected (TextModificationBase, AdminService):
+
+    def _handleSet(self):
+        if (self._value ==""):
+            raise ServiceError("ERR-E1",
+                               "The protected disclaimer cannot be empty")
+        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+        minfo.setProtectionDisclaimerProtected(self._value)
+
+    def _handleGet(self):
+        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+        return minfo.getProtectionDisclaimerProtected()
+
+class EditProtectionDisclaimerRestricted (TextModificationBase, AdminService):
+
+    def _handleSet(self):
+        if (self._value ==""):
+            raise ServiceError("ERR-E1",
+                               "The restricted disclaimer cannot be empty")
+        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+        minfo.setProtectionDisclaimerRestricted(self._value)
+
+    def _handleGet(self):
+        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+        return minfo.getProtectionDisclaimerRestricted()
 
 methodMap = {
@@ -203 +229 @@
     "groups.removeMember": GroupRemoveMember,
 
-    "merge.getCompleteUserInfo": MergeGetCompleteUserInfo
+    "merge.getCompleteUserInfo": MergeGetCompleteUserInfo,
+
+    "protection.editProtectionDisclaimerProtected": EditProtectionDisclaimerProtected,
+    "protection.editProtectionDisclaimerRestricted": EditProtectionDisclaimerRestricted
 }

indico/MaKaC/webinterface/pages/admins.py

@@ -120 +120 @@
             urlHandlers.UHAdminsSystem.getURL())
         mainSection.addItem( self._systemMenuItem)
+
+        self._protectionMenuItem = wcomponents.SideMenuItem(_("Protection"),
+            urlHandlers.UHAdminsProtection.getURL())
+        mainSection.addItem( self._protectionMenuItem)
 
         self._sideMenu.addSection(mainSection)
@@ -2641 +2645 @@
         vars["analyticsFormURL"] = urlHandlers.UHSaveAnalytics.getURL()
         return vars
+
+class WPAdminProtection( WPAdminsBase ):
+
+    def _setActiveSideMenuItem(self):
+        self._protectionMenuItem.setActive()
+
+    def _getPageContent( self, params ):
+        wc = WAdminProtection()
+        return wc.getHTML()
+
+class WAdminProtection(wcomponents.WTemplated):
+
+    def getVars( self ):
+        vars = wcomponents.WTemplated.getVars( self )
+        minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
+        vars["protectionDisclaimerProtected"] = minfo.getProtectionDisclaimerProtected()
+        vars["protectionDisclaimerRestricted"] = minfo.getProtectionDisclaimerRestricted()
+        return vars

indico/MaKaC/webinterface/rh/admins.py

@@ -592 +592 @@
         p = admins.WPAdminsConferenceStyles( self )
         return p.display()
+
+class RHAdminProtection( RHAdminBase ):
+    _uh = urlHandlers.UHDomains
+
+    def _checkParams( self, params ):
+        RHAdminBase._checkParams( self, params )
+
+    def _process( self ):
+        p = admins.WPAdminProtection( self )
+        return p.display()

indico/MaKaC/webinterface/tpls/ProtectionWidget.tpl

@@ -2 +2 @@
 <div id="protectionWidget" style="display:none" class="protectionWidget">
     <div class="protectionWidgetSection">
-        <div>${_("The information here displayed is")}
-        <span class="protectionHighlight${protection[0]}">${protection[1].upper()}</span><br/></div>
-        <div style="padding-top:10px; text-align:justify">
-            ${_("""The elements on this page are no viewable by the general public. The <a href="https://security.web.cern.ch/" target="blank">CERN Security Policy</a> binds you to treat such data confidientially as denoted in the policy itself.""")}
-        </div>
+        % if protection[0] == "Protected":
+            ${_("The information on this web page is restricted for display on the %s") % protection[1]}
+        % else:
+            ${_("The information on this web page is restricted for display to named individuals or specific groups.")}
+        % endif
+    </div>
+    <div class="protectionWidgetSection">
+        % if protection[0] == "Protected":
+            ${protectionDisclaimerProtected}
+        % else:
+            ${protectionDisclaimerRestricted}
+        % endif
     </div>
     <div class="protectionWidgetSection">
@@ -23 +30 @@
 
     style: {
-        width: '200px',
+        width: '250px',
         classes: 'ui-tooltip-rounded ui-tooltip-shadow ui-tooltip-popup',
         tip: {

indico/MaKaC/webinterface/tpls/SessionBar.tpl

@@ -9 +9 @@
 %>
 
-<div id="sessionBar" class="ui-follow-scroll sessionBar${" sessionBarDark" if dark_ == True else ""}">
+<div id="sessionBar" class="${'ui-follow-scroll' if target and not isFrontPage and protection[0] != 'Public' else ''} sessionBar${" sessionBarDark" if dark_ == True else ""}">
     % if isFrontPage or not target or protection == "Public":
         <div class="corner"></div>

indico/MaKaC/webinterface/urlHandlers.py

@@ -1952 +1952 @@
 class UHAdminsSystemModif( URLHandler ):
     _relativeURL = "adminSystem.py/modify"
+
+class UHAdminsProtection( URLHandler ):
+    _relativeURL = "adminProtection.py"
 
 class UHMaterialModification( URLHandler ):

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()