Show
Ignore:
Timestamp:
07/31/07 07:47:47 (1 year ago)
Author:
kisg
Message:

SvnAuthzAdminPlugin:

Add basic support for handling a specific authz_module. No file locking yet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • svnauthzadminplugin/0.10/svnauthz/admin_ui.py

    r2442 r2537  
    2929    def __init__(self): 
    3030        self.authz_file = self.env.config.get("trac", "authz_file") 
     31        self.authz_module = self.env.config.get("trac", "authz_module_name") 
     32        if self.authz_module != None and self.authz_module.strip() == "": 
     33            self.authz_module = None 
    3134        self.account_manager = AccountManager(self.env) 
    3235 
     
    6972        paths_disp = [] 
    7073        for repository, path in [(p.get_repo(), p.get_path()) for p in self.authz.get_paths()]: 
     74            if repository != self.authz_module: 
     75                # We ignore the paths from other modules from the display  
     76                continue 
    7177            path_disp = self._get_disp_path_name(repository, path) 
    7278            path_disp_url = pathname2url("%s:%s" % (repository, path)) 
     
    145151                validpath = self._get_valid_path(paths, url2pathname(urlpath)) 
    146152                if validpath: 
    147                     self.authz.del_path(validpath[1]
     153                    self.authz.del_path(validpath[1], self.authz_module
    148154        except Exception, e: 
    149155            req.hdf['delpath.error'] = e 
     
    154160        repository = None 
    155161        try: 
    156             self.authz.add_path(Path(path, [])) 
     162            self.authz.add_path(Path(path, [], self.authz_module)) 
    157163        except Exception, e: 
    158164            req.hdf['addpath.error'] = e 
     
    182188            return 
    183189        path = validpath[1]         
    184         path_members = self.authz.find_path(path
     190        path_members = self.authz.find_path(path, self.authz_module
    185191         
    186192        read = False 
     
    234240        members_to_del = req.args.get('selpathmember') 
    235241        member_acls = req.args.get('selpathmember_acl') 
    236         path_members = self.authz.find_path(path
     242        path_members = self.authz.find_path(path, self.authz_module
    237243         
    238244        if len(path_members) == 0: 
     
    347353     
    348354    def _get_disp_path_name(self, repository, path): 
    349             if repository == None or repository == "": 
    350                 return path 
    351             else: 
    352                 return "%s:%s" % (repository, path) 
     355        return path 
    353356 
    354357    def _get_model(self): 
  • svnauthzadminplugin/0.10/svnauthz/model.py

    r2451 r2537  
    170170            self.paths.append(p) 
    171171 
    172     def del_path(self, p): 
     172    def del_path(self, p, repo = None): 
    173173        if isinstance(p, Path):            
    174174            self.paths.remove(p) 
    175175        elif isinstance(p, types.StringTypes): 
    176             rp = self.find_path(p
    177             if rp
     176            rp = self.find_path(p, repo
     177            if isinstance(rp, Path)
    178178                self.paths.remove(rp) 
    179179 
  • svnauthzadminplugin/0.10/svnauthz_test/model.py

    r2442 r2537  
    7373    def test_find_path(self): 
    7474        p = Path("/ize", []) 
    75         m = AuthModel("fname", [], [p]) 
     75        p2 = Path("/ize2", [], "bigyo") 
     76        m = AuthModel("fname", [], [p, p2]) 
    7677        self.assertEquals(None, m.find_path("/bigyo")) 
    7778        self.assertEquals(p, m.find_path("/ize")) 
     79        self.assertEquals(None, m.find_path("/ize2")) 
     80        self.assertEquals(p2, m.find_path("/ize2", "bigyo")) 
    7881 
    7982    def test_find_group(self):