Changeset 2998

Timestamp:

01/15/10 17:25:30 (2 years ago)

Author:

jukka

Message:

Fixed #1958, made References to be proper materials and also changed branching to be an ability that materials don't have unless explicitly added.

Files:

• trunk/Branchable.py (added)
• trunk/CommonMixIn.py (modified) (2 diffs)
• trunk/LeMillReference.py (modified) (2 diffs)
• trunk/LeMillTool.py (modified) (1 diff)
• trunk/LearningResource.py (modified) (1 diff)
• trunk/LessonPlan.py (modified) (2 diffs)
• trunk/Material.py (modified) (1 diff)
• trunk/MemberFolder.py (modified) (1 diff)
• trunk/MultimediaMaterial.py (modified) (2 diffs)
• trunk/PILOTMaterial.py (modified) (2 diffs)
• trunk/Resource.py (modified) (3 diffs)
• trunk/SchoolProjectMaterial.py (modified) (2 diffs)
• trunk/config.py (modified) (3 diffs)
• trunk/skins/lemill/cached_script_featured_content.py (modified) (1 diff)

trunk/CommonMixIn.py

@@ -31 +31 @@
-from types import MethodType as instancemethod
-import time, re, traceback, transaction
-
-
-# For sortable_title -method
@@ -110 +109 @@
-    def isDiscussable(self):
-        """ We are not, but can be overrided by more complex resources """
+        return False
+
+    def isBranchable(self):
-        return False
-

trunk/LeMillReference.py

@@ -24 +24 @@
-from config import PROJECTNAME, MODIFY_CONTENT, VIEW
-from Material import Material
-
+,  author_schema, group_sharing
-
-
@@ -120 +120 @@
-
-
-
+author_schema + group_sharing + 
-
-schema = schema.copy()

trunk/LeMillTool.py

@@ -1663 +1663 @@
-        pc=getToolByName(self, 'portal_catalog')
-        if portal_type=='content':
-Reference','LeMill
+
-        return pc(portal_type=portal_type, getState="public")
-

trunk/LearningResource.py

@@ -140 +140 @@
-        else:
-            member_id = lutool.getAuthenticatedId()
-
-
+
+
+
-        if not getattr(self, 'getGroupEditing', False):
-            return True

trunk/LessonPlan.py

@@ -26 +26 @@
-from Material import Material
-from permissions import MODIFY_CONTENT
+from Branchable import Branchable
-
-lessonplan_schema = Schema((
@@ -113 +114 @@
-
-
-
+Branchable, 
-    """Lesson plan"""
-    schema = schema

trunk/Material.py

@@ -65 +65 @@
-        return text
-
-    ############ Workflow methods #################################
-
-    def canDeleteOnCancel(self):
-        """ Materials can have newly created branches that may look like good objects but they aren't """
-        history=self.getHistory()
-        if not history:
-            return True
-        summary=history[0].get('_summary','')
-        if summary.startswith('Copy of '):  # this is a newly created branch
-            return True  
-        return LearningResource.canDeleteOnCancel(self)
-
-    security.declarePrivate('manage_beforeDelete')
-    def manage_beforeDelete(self, item, container):
-        """ When deleting, remove branch-related references. """        
-        if self.Schema().has_key('branch_of'):
-            branch_parent= self.getBranch_of()
-            storeRefs = getattr(item, '_v_cp_refs', None)
-            if branch_parent and not storeRefs:
-                branch_parent.removeFromBranches(self.UID())
-        LearningResource.manage_beforeDelete(self, item, container)
-
-    ############ Branching ########################################
-
-
-
-    security.declareProtected(ADD_CONTENT_PERMISSION,'createBranch')
-    def createBranch(self, REQUEST):
-        """ Create a branch for object """
-        if self.state=='deleted' or self.state=='private':
-            return
-        lutool=getToolByName(self, 'lemill_usertool')
-        lt=getToolByName(self, 'lemill_tool')
-        parent = aq_parent(aq_inner(self))
-        new = parent.lemill_invokeFactory(parent, self.meta_type, id=self.meta_type.lower()+str(id(self)), do_create=True)
-        base_obj=self
-
-        for field in base_obj.schema.values():
-            # list all fields here that shouldn't be copyied to new object
-            if not getattr(field, 'copied_in_branching', True) or field.getName()=='id':
-                continue
-            old_accessor = field.getEditAccessor(base_obj)
-            new_mutator = field.getMutator(new)
-            if not old_accessor:
-                continue
-            val = old_accessor()
-            copied_val = None
-            try:
-                copied_val = copy.copy(val)
-            except TypeError:
-                copied_val = copy.copy(val.aq_base)
-            new_mutator(copied_val)
-
-        # Setting parent and needed values
-        baseuid=base_obj.UID()
-        base_obj.addToBranches(new.UID())
-        new.setBranch_of(baseuid)
-        author=lutool.getAuthenticatedId()
-        new.setCreators([author]+list(base_obj.Creators()))
-        new.storeInHistory({}, summary='Copy of %s created' % base_obj.title_or_id())
-        new.setHistory(new.getHistory()+base_obj.getHistory()+new.getHistory())
-        lt.addPortalMessage('You are editing a copy of the original learning resource.')
-        return REQUEST.RESPONSE.redirect('%s/base_edit' % new.absolute_url())        
-
-
-    security.declareProtected(ModerateContent,'removeBranches')
-    def removeBranches(self):
-        """ Manage command to remove broken branches """
-        self.setBranches([])
-
-    def addToBranches(self, UID):
-        """ Makes sure that object UID is in branches """
-        branch_list = self.getRawBranches()
-        if UID not in branch_list:
-            branch_list.append(UID)
-            self.setBranches(branch_list)
-
-    def removeFromBranches(self, UID):
-        """ remove """
-        branch_list = self.getRawBranches()
-        if UID in branch_list:
-            branch_list.remove(UID)
-            self.setBranches(branch_list)
-
-    def allowOnlyBranch(self):
-        """ only checks if this is 'locked' resource, doesn't check if the author is one that is asking """
-        return getattr(self, 'editingMode','')=='other_users_can_edit_a_copy'            
-
-    def allowSettingOfEditingPermissions(self):
-        """ Only authors and moderators can hide drafts or prevent editing """
-        # if translation, don't show editing_settings fields
-        return (self.amIOwner() or self.canIModerate()) and not self.getRawTranslation_of() 
-
-
-
-
-registerType(Material, PROJECTNAME)

trunk/MemberFolder.py

@@ -545 +545 @@
-                elif res.meta_type=='Collection':
-                    dict['Collections'].append(res)
- or res.meta_type=='LeMillReference'
+
-                    dict['Pieces'].append(res)
-            return dict                   

trunk/MultimediaMaterial.py

@@ -25 +25 @@
-from Schemata import no_description, material_schema, community_editing_schema, draft_schema
-from Material import Material
+from Branchable import Branchable
-from permissions import MODIFY_CONTENT
-import re
@@ -59 +60 @@
-
-
-
+Branchable, 
-    """Web page"""
-

trunk/PILOTMaterial.py

@@ -25 +25 @@
-from Products.CMFPlone import PloneMessageFactory as PMF
-from Material import Material
+from Branchable import Branchable
-
-pilotmaterial_schema = Schema((
@@ -86 +87 @@
-
-
-
+Branchable, 
-    """ PILOT Material """
-

trunk/Resource.py

@@ -92 +92 @@
-        self.recalculateAuthors()
-        self.recalculateScore()
-        # if in MATERIAL_TYPES, see if state has to be changed
-        if self.hasComplexWorkflow():
-            if self.getHideDrafts():
@@ -823 +822 @@
-            f.set(self, reason)
-        self.setState('deleted')
-
-
+
-        try:
-            self.reindexObject(['getState'])
@@ -834 +832 @@
-    def rescue(self, REQUEST):
-        """Undelete a resource """
-
-
+
-        self.undeleteResource()
-        return REQUEST.RESPONSE.redirect(self.absolute_url())

trunk/SchoolProjectMaterial.py

@@ -25 +25 @@
-from config import PROJECTNAME, MODIFY_CONTENT, VIEW
-from Material import Material
+from Branchable import Branchable
-
-schoolprojectmaterial_schema = Schema((
@@ -101 +102 @@
-#schema['bodyText'].widget.visible = {'edit':'invivible', 'view':'invisible'}
-
-
+Branchable, 
-    """ School Project Material """
-

trunk/config.py

@@ -104 +104 @@
-REMOTE_SERVERS = ["http://lemill.net"] 
-
-
-Reference','LeMill
+, 'LeMillReference'
+
-ACTIVITY_TYPES = ('Activity',)
-TOOLS_TYPES = ('Tool',)
@@ -282 +282 @@
-    {'id':'drafts', 'title':'Draft', 'view':'lemill_published_view', 'sortby':'getLatestEdit', 'reversed':True,'criterions':[('ATCurrentAuthorCriterion','Creator',''),('ATSelectionCriterion','getState',['draft','private'])]},)),
-    # +++++++++++++++++++++++
-Reference','LeMill
+
-    {'id':'language', 'title':'Language', 'getmethod':'Language', 'view':'lemill_browse_content'},
-    {'id':'subject_area', 'title':'Subject area', 'getmethod':'getSubject_area', 'view':'lemill_browse_content'},
@@ -296 +296 @@
-    {'id':'browse_pieces', 'title':'Pieces', 'view':'lemill_content_titlecloud'},)),
-    # +++++++++++++++++++++++
-Reference','LeMill
+
-    {'id':'recent', 'title':"What's going on", 'getmethod':'getLatestEdit', 'sortby':'getLatestEdit', 'reversed':True, 'view':'lemill_recent_view'},))
-    # +++++++++++++++++++++++

trunk/skins/lemill/cached_script_featured_content.py

@@ -10 +10 @@
-SCORE_THRESHOLD=5
-
-list(context.getMaterialTypes())+['LeMillReference']
+context.getMaterialTypes()
-top3_categories={'top3languages':'Language', 'top3tags':'getTags', 'top3subject_areas':'getSubject_area', 'top3target_groups':'getTarget_group'}
-