Changeset 4110

Show
Ignore:
Timestamp:
08/02/08 12:47:03 (4 months ago)
Author:
tsooboi
Message:

Changes to improve code efficiency

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • navcontrolplugin/0.11/navcontrol/filter.py

    r4109 r4110  
    3939         
    4040    def post_process_request(self, req, template, data, content_type): 
    41         self._remove_items(req, 'mainnav') 
    42         self._remove_items(req, 'metanav')     
     41        self._remove_items(req) 
    4342        self._move_items(req, 'main2meta') 
    4443        self._move_items(req, 'meta2main') 
     
    4746 
    4847    # Internal methods 
    49     def _remove_items(self, req, name): 
    50         items = set(getattr(self, name)) 
     48    def _remove_items(self, req): 
     49        items = set(getattr(self, 'mainnav')) \ 
     50            | set(getattr(self, 'metanav')) 
    5151        prefix_list=['-', '!'] 
    52         items |= self._get_items(req, name, prefix_list) 
     52        items |= self._get_items(req, 'mainnav', prefix_list) \ 
     53            | self._get_items(req, 'metanav', prefix_list) 
    5354        for item in items: 
    54             navitems = req.chrome['nav'][name] 
     55            navitems = req.chrome['nav']['mainnav'] \ 
     56                + req.chrome['nav']['metanav'] 
    5557            for navitem in navitems: 
    5658              if navitem['name'] == item: