Changeset 1199 in products

Timestamp:

Jul 31, 2009 1:21:12 PM (15 years ago)

Author:

piv

Message:

set category sufix as optional setting, fix actions tab level functionality

Location:

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu

Files:

• browser/menu.py (modified) (2 diffs)
• browser/viewlets.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/menu.py

@@ -19 +19 @@
     def __init__(self, context):
         super(DropDownMenuQueryBuilder, self).__init__(context)
-        # TODO: make sure sitemap query builder is what we need
-        # override depth by dropdown menu settings
         if self._settings.content_tabs_level > 0:
             self.query['path']['depth'] = self._settings.content_tabs_level
@@ -39 +37 @@
     def __init__(self, context, view=None):
         super(DropDownMenuStrategy, self).__init__(context, view)
-        # TODO: make sure default navtree strategy is what we need
         self.bottomLevel = self._settings.content_tabs_level
 

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py

@@ -33 +33 @@
         self.conf = conf = self._settings()
         self.tool = getToolByName(context, 'portal_actions')
-
-        #import pdb;pdb.set_trace()
 
         # fetch actions-based tabs?
@@ -78 +76 @@
             currentItem = False
             currentParent = False
-            # TODO: adjust img tag
             icon = info['icon'] and '<img src="%s" />' % info['icon'] or ''
 
             # look up children for a given action
             children = []
-            if level <= self.conf.actions_tabs_level:
+            bottomLevel = self.conf.actions_tabs_level
+            if bottomLevel < 1 or level < bottomLevel:
                 # try to find out appropriate subcategory
-                subcat_id = info['id'] + self.conf.nested_category_sufix
+                subcat_id = info['id']
+                if self.conf.nested_category_sufix is not None:
+                    subcat_id += self.conf.nested_category_sufix
                 if self.conf.nested_category_prefix is not None:
                     subcat_id = self.conf.nested_category_prefix + subcat_id
-                if subcat_id in category.objectIds():
+                if subcat_id != info['id'] and \
+                   subcat_id in category.objectIds():
                     subcat = category._getOb(subcat_id)
                     if IActionCategory.providedBy(subcat):
@@ -129 +130 @@
     def _content_tabs(self):
         """Return tree of tabs based on content structure"""
-        # TODO: check currentItem functionality
+        # TODO: make non-folderish work as proxy
         context = aq_inner(self.context)
 

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/interfaces.py

@@ -88 +88 @@
         description=_(u"Sufix part of the category id to be looked up during "
                       u"linking with action."),
-        default=u"_sub")
+        default=u"_sub",
+        required=False)