Changeset 1122 for ZMS/trunk/zmsobject.py

Timestamp:

21.07.2010 22:19:32 (22 months ago)

Author:

zmsdev

Message:

Added support for defaults of mandatory sub-objects, insert-commands and programmatic zexp import.

File:

• ZMS/trunk/zmsobject.py (modified) (2 diffs)

ZMS/trunk/zmsobject.py

@@ -957 +957 @@
     #  ZMSObject.filtered_command_actions:
     # --------------------------------------------------------------------------
-    def filtered_command_actions(self, path, REQUEST):
+    def filtered_command_actions(self, path, REQUEST, insert_actions=False):
       actions = []
       auth_user = REQUEST['AUTHENTICATED_USER']
@@ -964 +964 @@
       for metaCmdId in self.getMetaCmdIds():
         metaCmd = self.getMetaCmd(metaCmdId)
-        hasMetaType = self.meta_id in metaCmd['meta_types']
-        hasRole = False
-        hasRole = hasRole or len(self.intersection_list(self.getUserRoles(auth_user),metaCmd['roles'])) > 0
-        hasRole = hasRole or auth_user.has_role('Manager')
-        if hasMetaType and hasRole:
-          actions.append((metaCmd['name'],path+'manage_executeMetacmd'))
+        if (insert_actions and metaCmd['id'].startswith('manage_add')) or \
+           (not insert_actions and not metaCmd['id'].startswith('manage_add')):
+          hasMetaType = self.meta_id in metaCmd['meta_types']
+          hasRole = False
+          hasRole = hasRole or len(self.intersection_list(self.getUserRoles(auth_user),metaCmd['roles'])) > 0
+          hasRole = hasRole or auth_user.has_role('Manager')
+          if hasMetaType and hasRole:
+            actions.append((metaCmd['name'],path+'manage_executeMetacmd'))
       
       # Return action list.