Changeset 02505d in indico

Timestamp:

06/10/10 18:11:31 (3 years ago)

Author:

Jeremy Herr <jeremy.herr@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

d531f9

Parents:

624b57

git-author:

Jeremy Herr <jeremy.herr@…> (03/16/10 17:06:20)

git-committer:

Jeremy Herr <jeremy.herr@…> (06/10/10 18:11:31)

Message:

[IMP] Deal with users/groups differently

Jerome C of CDS wants to put users and groups into two separate blocks, so I did that.

Also added an optional "source" argument to both confToXMLMarc21() and _confToXMLMarc21().
It will only generate the access list info if this arg is set to 'RecordingManager?'.
No need to provide access list info to anyone outside CERN.

File:

• indico/MaKaC/common/output.py (modified) (4 diffs)

indico/MaKaC/common/output.py

@@ -878 +878 @@
     #fb
 
-    def confToXMLMarc21(self,conf,includeSession=1,includeContribution=1,includeMaterial=1,out=None, forceCache=False):
+    def confToXMLMarc21(self,conf,includeSession=1,includeContribution=1,includeMaterial=1,out=None, forceCache=False, source=None):
 
         if not out:
@@ -892 +892 @@
             # No cache, build the XML
             temp = XMLGen(init=False)
-            self._confToXMLMarc21(conf,includeSession,includeContribution,includeMaterial, out=temp)
+            self._confToXMLMarc21(conf,includeSession,includeContribution,includeMaterial, out=temp, source=source)
             xml = temp.getXml()
             # save XML in cache
@@ -898 +898 @@
         out.writeXML(xml)
 
-    def _confToXMLMarc21(self,conf,includeSession=1,includeContribution=1,includeMaterial=1,out=None):
+    def _confToXMLMarc21(self,conf,includeSession=1,includeContribution=1,includeMaterial=1,out=None, source=None):
         if not out:
             out = self._XMLGen
@@ -1059 +1059 @@
         # Access control information, if event is protected
         # Get set containing Avatar objects (if empty, that means event is public)
-        allowed_avatars = conf.getRecursiveAllowedToAccessList()
-        if allowed_avatars is not None and len(allowed_avatars) > 0:
-            # Build a list holding email strings instead of Avatar objects
-            allowed_emails = []
-            for av in allowed_avatars:
-                if isinstance(av, Avatar):
-                    allowed_emails.append(av.getEmail())
-                elif isinstance(av, CERNGroup):
-                    allowed_emails.append(av.getId() + " [CERN]")
-                else:
-                    allowed_emails.append("UNKNOWN: %s" % av.getId())
-
-            out.openTag("marc:datafield",[["tag","506"], ["ind1","1"], ["ind2"," "]])
-            out.writeTag("marc:subfield", "Restricted",  [["code", "a"]])
-            for email_id in allowed_emails:
-                out.writeTag("marc:subfield", email_id,  [["code", "d"]])
-            out.writeTag("marc:subfield", "group",       [["code", "f"]])
-            out.writeTag("marc:subfield", "CDS Invenio", [["code", "2"]]) # <-- should not be hard coded here
-            out.writeTag("marc:subfield", "SzGeCERN",    [["code", "5"]]) # <-- should not be hard coded here
-            out.closeTag("marc:datafield")
+        if source is not None and source == 'RecordingManager':
+            allowed_users = conf.getRecursiveAllowedToAccessList()
+            if allowed_users is not None and len(allowed_users) > 0:
+                # Populate two lists holding email/group strings instead of Avatar/Group objects
+                allowed_emails = []
+                allowed_groups = []
+                for av in allowed_users:
+                    if isinstance(av, Avatar):
+                        allowed_emails.append(av.getEmail())
+                    elif isinstance(av, CERNGroup):
+                        allowed_groups.append(av.getId() + " [CERN]")
+                    else:
+                        allowed_emails.append("UNKNOWN: %s" % av.getId())
+
+                out.openTag("marc:datafield",[["tag","506"], ["ind1","1"], ["ind2"," "]])
+                out.writeTag("marc:subfield", "Restricted",  [["code", "a"]])
+                for email_id in allowed_groups:
+                    out.writeTag("marc:subfield", email_id,  [["code", "d"]])
+                out.writeTag("marc:subfield", "group",       [["code", "f"]])
+                out.writeTag("marc:subfield", "CDS Invenio", [["code", "2"]]) # <-- should not be hard coded here
+                out.writeTag("marc:subfield", "SzGeCERN",    [["code", "5"]]) # <-- should not be hard coded here
+                out.closeTag("marc:datafield")
+
+                out.openTag("marc:datafield",[["tag","506"], ["ind1","1"], ["ind2"," "]])
+                out.writeTag("marc:subfield", "Restricted",  [["code", "a"]])
+                for email_id in allowed_emails:
+                    out.writeTag("marc:subfield", email_id,  [["code", "d"]])
+                out.writeTag("marc:subfield", "email",       [["code", "f"]])
+                out.writeTag("marc:subfield", "CDS Invenio", [["code", "2"]]) # <-- should not be hard coded here
+                out.writeTag("marc:subfield", "SzGeCERN",    [["code", "5"]]) # <-- should not be hard coded here
+                out.closeTag("marc:datafield")
 
     ## def sessionToXMLMarc21(self,session,includeMaterial=1, out=None, forceCache=False):