Changeset 544

Timestamp:

08/07/09 13:14:32 (3 years ago)

Author:

jon

Message:

Adding layers to collective.contentlicensing overrides

Location:

enpraxis.educommons/trunk/enpraxis/educommons

Files:

• browser/__init__.py (modified) (4 diffs)
• overrides.zcml (modified) (2 diffs)

enpraxis.educommons/trunk/enpraxis/educommons/browser/__init__.py

@@ -308 +308 @@
         return copyright, holder, license_name, license_url, license_button
 
-
-
     def getCitationInfo(self):
         """ Gets the citation information """
@@ -327 +325 @@
             if parent.instructorAsCreator == True:
                 instr_name = parent.instructorName
-                names = [instr_name.strip()]
+                if instr_name != u'':
+                    names = [instr_name.strip()]
                 names += [name.strip() for name in parent.Creators()]
                 if len(self.context.Creators()) > 1:
@@ -334 +333 @@
             if self.context.instructorAsCreator == True:
                 instr_name = self.context.instructorName
-                names = [instr_name.strip()]
+                if instr_name != u'':
+                    names = [instr_name.strip()]
             names += [name.strip() for name in self.context.Creators()]
         else:
@@ -344 +344 @@
 
             crs = cr.split(' ')
-            
 
             for part in crs[:-1]:

enpraxis.educommons/trunk/enpraxis/educommons/overrides.zcml

@@ -24 +24 @@
     template="browser/citation_view.pt"
     permission="zope2.View"
+    layer="collective.contentlicensing.interfaces.IContentLicensingLayer"
     />
 
@@ -32 +33 @@
     template="browser/copyright_byline.pt"
     permission="zope2.View"
+    layer="collective.contentlicensing.interfaces.IContentLicensingLayer"
     />