Show More
@@ -33,7 +33,7 b' fixes' | |||
|
33 | 33 | - fixes #762 user global activation flag is also respected for LDAP created |
|
34 | 34 | accounts |
|
35 | 35 | - use password obfuscate when clonning a remote repo with credentials inside |
|
36 | - fixed issue with renaming repos group together with changing parents | |
|
36 | - fixed issue with renaming repository group together with changing parents | |
|
37 | 37 | - disallow cloning from file:/// URIs |
|
38 | 38 | - handle all cases with multiple IP addresses in proxy headers |
|
39 | 39 | |
@@ -239,7 +239,7 b' news' | |||
|
239 | 239 | fixes |
|
240 | 240 | +++++ |
|
241 | 241 | |
|
242 | - fixed visual permissions check on repos groups inside groups | |
|
242 | - fixed visual permissions check on repository groups inside groups | |
|
243 | 243 | - fixed issues with non-ascii search terms in search, and indexers |
|
244 | 244 | - fixed parsing of page number in GET parameters |
|
245 | 245 | - fixed issues with generating pull-request overview for repos with |
@@ -406,7 +406,7 b' news' | |||
|
406 | 406 | - created rcextensions module with additional mappings (ref #322) and |
|
407 | 407 | post push/pull/create repo hooks callbacks |
|
408 | 408 | - implemented #377 Users view for his own permissions on account page |
|
409 | - #399 added inheritance of permissions for user group on repos groups | |
|
409 | - #399 added inheritance of permissions for user group on repository groups | |
|
410 | 410 | - #401 repository group is automatically pre-selected when adding repos |
|
411 | 411 | inside a repository group |
|
412 | 412 | - added alternative HTTP 403 response when client failed to authenticate. Helps |
@@ -600,7 +600,7 b' 1.2.3 (**2011-11-02**)' | |||
|
600 | 600 | news |
|
601 | 601 | ++++ |
|
602 | 602 | |
|
603 | - added option to manage repos group for non admin users | |
|
603 | - added option to manage repository group for non admin users | |
|
604 | 604 | - added following API methods for get_users, create_user, get_users_groups, |
|
605 | 605 | get_users_group, create_users_group, add_user_to_users_groups, get_repos, |
|
606 | 606 | get_repo, create_repo, add_user_to_repo |
@@ -205,13 +205,13 b' def make_map(config):' | |||
|
205 | 205 | m.connect("formatted_repos_group", "/repos_groups/{group_name:.*?}.{format}", |
|
206 | 206 | action="show", conditions=dict(method=["GET"], |
|
207 | 207 | function=check_group)) |
|
208 | # ajax delete repos group perm user | |
|
208 | # ajax delete repository group perm user | |
|
209 | 209 | m.connect('delete_repos_group_user_perm', |
|
210 | 210 | "/delete_repos_group_user_perm/{group_name:.*?}", |
|
211 | 211 | action="delete_repos_group_user_perm", |
|
212 | 212 | conditions=dict(method=["DELETE"], function=check_group)) |
|
213 | 213 | |
|
214 | # ajax delete repos group perm users_group | |
|
214 | # ajax delete repository group perm users_group | |
|
215 | 215 | m.connect('delete_repos_group_users_group_perm', |
|
216 | 216 | "/delete_repos_group_users_group_perm/{group_name:.*?}", |
|
217 | 217 | action="delete_repos_group_users_group_perm", |
@@ -142,7 +142,7 b' class ReposGroupsController(BaseControll' | |||
|
142 | 142 | owner=self.rhodecode_user.user_id |
|
143 | 143 | ) |
|
144 | 144 | Session().commit() |
|
145 | h.flash(_('Created repos group %s') \ | |
|
145 | h.flash(_('Created repository group %s') \ | |
|
146 | 146 | % form_result['group_name'], category='success') |
|
147 | 147 | #TODO: in futureaction_logger(, '', '', '', self.sa) |
|
148 | 148 | except formencode.Invalid, errors: |
@@ -154,7 +154,7 b' class ReposGroupsController(BaseControll' | |||
|
154 | 154 | encoding="UTF-8") |
|
155 | 155 | except Exception: |
|
156 | 156 | log.error(traceback.format_exc()) |
|
157 | h.flash(_('Error occurred during creation of repos group %s') \ | |
|
157 | h.flash(_('Error occurred during creation of repository group %s') \ | |
|
158 | 158 | % request.POST.get('group_name'), category='error') |
|
159 | 159 | parent_group_id = form_result['group_parent_id'] |
|
160 | 160 | #TODO: maybe we should get back to the main view, not the admin one |
@@ -217,7 +217,7 b' class ReposGroupsController(BaseControll' | |||
|
217 | 217 | |
|
218 | 218 | new_gr = ReposGroupModel().update(group_name, form_result) |
|
219 | 219 | Session().commit() |
|
220 | h.flash(_('Updated repos group %s') \ | |
|
220 | h.flash(_('Updated repository group %s') \ | |
|
221 | 221 | % form_result['group_name'], category='success') |
|
222 | 222 | # we now have new name ! |
|
223 | 223 | group_name = new_gr.group_name |
@@ -232,7 +232,7 b' class ReposGroupsController(BaseControll' | |||
|
232 | 232 | encoding="UTF-8") |
|
233 | 233 | except Exception: |
|
234 | 234 | log.error(traceback.format_exc()) |
|
235 | h.flash(_('Error occurred during update of repos group %s') \ | |
|
235 | h.flash(_('Error occurred during update of repository group %s') \ | |
|
236 | 236 | % request.POST.get('group_name'), category='error') |
|
237 | 237 | |
|
238 | 238 | return redirect(url('edit_repos_group', group_name=group_name)) |
@@ -263,7 +263,7 b' class ReposGroupsController(BaseControll' | |||
|
263 | 263 | try: |
|
264 | 264 | ReposGroupModel().delete(group_name) |
|
265 | 265 | Session().commit() |
|
266 | h.flash(_('Removed repos group %s') % group_name, | |
|
266 | h.flash(_('Removed repository group %s') % group_name, | |
|
267 | 267 | category='success') |
|
268 | 268 | #TODO: in future action_logger(, '', '', '', self.sa) |
|
269 | 269 | except Exception: |
@@ -240,7 +240,7 b' def is_valid_repo(repo_name, base_path, ' | |||
|
240 | 240 | |
|
241 | 241 | def is_valid_repos_group(repos_group_name, base_path, skip_path_check=False): |
|
242 | 242 | """ |
|
243 | Returns True if given path is a repos group False otherwise | |
|
243 | Returns True if given path is a repository group False otherwise | |
|
244 | 244 | |
|
245 | 245 | :param repo_name: |
|
246 | 246 | :param base_path: |
@@ -104,7 +104,7 b' class ReposGroupModel(BaseModel):' | |||
|
104 | 104 | log.debug('skipping group rename') |
|
105 | 105 | return |
|
106 | 106 | |
|
107 | log.debug('renaming repos group from %s to %s' % (old, new)) | |
|
107 | log.debug('renaming repository group from %s to %s' % (old, new)) | |
|
108 | 108 | |
|
109 | 109 | old_path = os.path.join(self.repos_path, old) |
|
110 | 110 | new_path = os.path.join(self.repos_path, new) |
@@ -472,7 +472,7 b' class UserModel(BaseModel):' | |||
|
472 | 472 | return user |
|
473 | 473 | |
|
474 | 474 | #================================================================== |
|
475 | # SET DEFAULTS GLOBAL, REPOS, REPOS GROUPS | |
|
475 | # SET DEFAULTS GLOBAL, REPOS, REPOSITORY GROUPS | |
|
476 | 476 | #================================================================== |
|
477 | 477 | uid = user.user_id |
|
478 | 478 |
@@ -88,7 +88,7 b' class UserGroupModel(BaseModel):' | |||
|
88 | 88 | |
|
89 | 89 | def delete(self, users_group, force=False): |
|
90 | 90 | """ |
|
91 | Deletes repos group, unless force flag is used | |
|
91 | Deletes repository group, unless force flag is used | |
|
92 | 92 | raises exception if there are members in that group, else deletes |
|
93 | 93 | group and users |
|
94 | 94 |
@@ -2,15 +2,15 b'' | |||
|
2 | 2 | <%inherit file="/base/base.html"/> |
|
3 | 3 | |
|
4 | 4 | <%def name="title()"> |
|
5 | ${_('Add repos group')} · ${c.rhodecode_name} | |
|
5 | ${_('Add repository group')} · ${c.rhodecode_name} | |
|
6 | 6 | </%def> |
|
7 | 7 | |
|
8 | 8 | <%def name="breadcrumbs_links()"> |
|
9 | 9 | ${h.link_to(_('Admin'),h.url('admin_home'))} |
|
10 | 10 | » |
|
11 | ${h.link_to(_('Repos groups'),h.url('repos_groups'))} | |
|
11 | ${h.link_to(_('Repository groups'),h.url('repos_groups'))} | |
|
12 | 12 | » |
|
13 |
${_(' |
|
|
13 | ${_('Add new repository group')} | |
|
14 | 14 | </%def> |
|
15 | 15 | |
|
16 | 16 | <%def name="page_nav()"> |
@@ -2,15 +2,15 b'' | |||
|
2 | 2 | <%inherit file="/base/base.html"/> |
|
3 | 3 | |
|
4 | 4 | <%def name="title()"> |
|
5 | ${_('Edit repos group')} ${c.repos_group.name} · ${c.rhodecode_name} | |
|
5 | ${_('Edit repository group')} ${c.repos_group.name} · ${c.rhodecode_name} | |
|
6 | 6 | </%def> |
|
7 | 7 | |
|
8 | 8 | <%def name="breadcrumbs_links()"> |
|
9 | 9 | ${h.link_to(_('Admin'),h.url('admin_home'))} |
|
10 | 10 | » |
|
11 | ${h.link_to(_('Repos groups'),h.url('repos_groups'))} | |
|
11 | ${h.link_to(_('Repository groups'),h.url('repos_groups'))} | |
|
12 | 12 | » |
|
13 |
${_(' |
|
|
13 | ${_('Edit repository group')} "${c.repos_group.name}" | |
|
14 | 14 | </%def> |
|
15 | 15 | |
|
16 | 16 | <%def name="page_nav()"> |
General Comments 0
You need to be logged in to leave comments.
Login now