Changeset 2798

Show
Ignore:
Timestamp:
11/18/07 02:29:24 (1 year ago)
Author:
coderanger
Message:
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tracforgeplugin/0.10/tracforge/admin/dispatch.py

    r2795 r2798  
    166166        if 'trac.env_path' in environ: 
    167167            del environ['trac.env_path'] 
    168         environ['tracforge_master_link'] = req.href.projects() 
     168        if req.perm.has_permission('PROJECT_LIST'): 
     169            environ['tracforge_master_link'] = req.href.projects() 
    169170         
    170171        # Remove mod_python option to avoid conflicts 

  • tracforgeplugin/0.10/tracforge/linker/auth.py

    r1261 r2798  
    2929            yield ('metanav', 'login', 'logged in as %s' % req.authname) 
    3030            yield ('metanav', 'logout', 
    31                    html.A('Logout', href=self.master_href.logout(referer=req.href(req.path_info)))) 
     31                   html.A('Logout', href=self.master_href.logout())) 
    3232        else: 
    3333            yield ('metanav', 'login', 
    34                    html.A('Login', href=self.master_href.login(referer=req.href(req.path_info)))) 
     34                   html.A('Login', href=self.master_href.login())) 
     35                    
     36    # IRequestHandler methods 
     37    def process_request(self, req): 
     38        if req.path_info.startswith('/login'): 
     39            if req.authname and req.authname != 'anonymous': 
     40                # Already logged in, reconstruct last path 
     41                req.redirect(req.href()) 
     42            else: 
     43                # Safe, send to master 
     44                req.redirect(self.master_href.login()) 
     45        raise TracError 
    3546 
    3647    # Internal methods