Changeset 4111

Show
Ignore:
Timestamp:
08/02/08 13:10:58 (4 months ago)
Author:
tsooboi
Message:

Rolling back premature commit

Files:

Legend:

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

    r4110 r4111  
    3939         
    4040    def post_process_request(self, req, template, data, content_type): 
    41         self._remove_items(req) 
     41        self._remove_items(req, 'mainnav') 
     42        self._remove_items(req, 'metanav')     
    4243        self._move_items(req, 'main2meta') 
    4344        self._move_items(req, 'meta2main') 
     
    4647 
    4748    # Internal methods 
    48     def _remove_items(self, req): 
    49         items = set(getattr(self, 'mainnav')) \ 
    50             | set(getattr(self, 'metanav')) 
     49    def _remove_items(self, req, name): 
     50        items = set(getattr(self, name)) 
    5151        prefix_list=['-', '!'] 
    52         items |= self._get_items(req, 'mainnav', prefix_list) \ 
    53             | self._get_items(req, 'metanav', prefix_list) 
     52        items |= self._get_items(req, name, prefix_list) 
    5453        for item in items: 
    55             navitems = req.chrome['nav']['mainnav'] \ 
    56                 + req.chrome['nav']['metanav'] 
     54            navitems = req.chrome['nav'][name] 
    5755            for navitem in navitems: 
    5856              if navitem['name'] == item: