Show More
@@ -64,9 +64,7 b' class LdapSettingsController(BaseControl' | |||
|
64 | 64 | force_defaults=True,) |
|
65 | 65 | |
|
66 | 66 | def ldap_settings(self): |
|
67 | """ | |
|
68 | POST ldap create and store ldap settings | |
|
69 | """ | |
|
67 | """POST ldap create and store ldap settings""" | |
|
70 | 68 | |
|
71 | 69 | settings_model = SettingsModel() |
|
72 | 70 | _form = LdapSettingsForm()() |
@@ -100,7 +98,7 b' class LdapSettingsController(BaseControl' | |||
|
100 | 98 | encoding="UTF-8") |
|
101 | 99 | except Exception: |
|
102 | 100 | log.error(traceback.format_exc()) |
|
103 | h.flash(_('error occured during update of ldap settings'), | |
|
101 | h.flash(_('error occurred during update of ldap settings'), | |
|
104 | 102 | category='error') |
|
105 | 103 | |
|
106 | 104 | return redirect(url('ldap_home')) |
@@ -120,7 +120,7 b' class PermissionsController(BaseControll' | |||
|
120 | 120 | encoding="UTF-8") |
|
121 | 121 | except Exception: |
|
122 | 122 | log.error(traceback.format_exc()) |
|
123 | h.flash(_('error occured during update of permissions'), | |
|
123 | h.flash(_('error occurred during update of permissions'), | |
|
124 | 124 | category='error') |
|
125 | 125 | |
|
126 | 126 | return redirect(url('edit_permission', id=id)) |
@@ -107,7 +107,7 b' class ReposController(BaseController):' | |||
|
107 | 107 | |
|
108 | 108 | except Exception: |
|
109 | 109 | log.error(traceback.format_exc()) |
|
110 | msg = _('error occured during creation of repository %s') \ | |
|
110 | msg = _('error occurred during creation of repository %s') \ | |
|
111 | 111 | % form_result.get('repo_name') |
|
112 | 112 | h.flash(msg, category='error') |
|
113 | 113 | if request.POST.get('user_created'): |
@@ -206,7 +206,7 b' class ReposController(BaseController):' | |||
|
206 | 206 | |
|
207 | 207 | except Exception, e: |
|
208 | 208 | log.error(traceback.format_exc()) |
|
209 | h.flash(_('An error occured during deletion of %s') % repo_name, | |
|
209 | h.flash(_('An error occurred during deletion of %s') % repo_name, | |
|
210 | 210 | category='error') |
|
211 | 211 | |
|
212 | 212 | return redirect(url('repos')) |
@@ -222,7 +222,7 b' class ReposController(BaseController):' | |||
|
222 | 222 | repo_model = RepoModel() |
|
223 | 223 | repo_model.delete_perm_user(request.POST, repo_name) |
|
224 | 224 | except Exception, e: |
|
225 | h.flash(_('An error occured during deletion of repository user'), | |
|
225 | h.flash(_('An error occurred during deletion of repository user'), | |
|
226 | 226 | category='error') |
|
227 | 227 | raise HTTPInternalServerError() |
|
228 | 228 | |
@@ -237,14 +237,14 b' class ReposController(BaseController):' | |||
|
237 | 237 | repo_model = RepoModel() |
|
238 | 238 | repo_model.delete_stats(repo_name) |
|
239 | 239 | except Exception, e: |
|
240 | h.flash(_('An error occured during deletion of repository stats'), | |
|
240 | h.flash(_('An error occurred during deletion of repository stats'), | |
|
241 | 241 | category='error') |
|
242 | 242 | return redirect(url('edit_repo', repo_name=repo_name)) |
|
243 | 243 | |
|
244 | 244 | @HasPermissionAllDecorator('hg.admin') |
|
245 | 245 | def repo_cache(self, repo_name): |
|
246 | 246 | """ |
|
247 |
INVALIDATE exis |
|
|
247 | INVALIDATE existing repository cache | |
|
248 | 248 | :param repo_name: |
|
249 | 249 | """ |
|
250 | 250 |
@@ -1,7 +1,8 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | """ |
|
3 |
|
|
|
4 | ~~~~~~~~~~~~~~ | |
|
3 | rhodecode.controllers.admin.settings | |
|
4 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
|
5 | ||
|
5 | 6 | settings controller for rhodecode admin |
|
6 | 7 | |
|
7 | 8 | :created_on: Jul 14, 2010 |
@@ -87,7 +87,7 b' class UsersController(BaseController):' | |||
|
87 | 87 | encoding="UTF-8") |
|
88 | 88 | except Exception: |
|
89 | 89 | log.error(traceback.format_exc()) |
|
90 | h.flash(_('error occured during creation of user %s') \ | |
|
90 | h.flash(_('error occurred during creation of user %s') \ | |
|
91 | 91 | % request.POST.get('username'), category='error') |
|
92 | 92 | return redirect(url('users')) |
|
93 | 93 | |
@@ -144,7 +144,7 b' class UsersController(BaseController):' | |||
|
144 | 144 | except (UserOwnsReposException, DefaultUserException), e: |
|
145 | 145 | h.flash(str(e), category='warning') |
|
146 | 146 | except Exception: |
|
147 | h.flash(_('An error occured during deletion of user'), | |
|
147 | h.flash(_('An error occurred during deletion of user'), | |
|
148 | 148 | category='error') |
|
149 | 149 | return redirect(url('users')) |
|
150 | 150 |
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | """ |
|
3 |
|
|
|
4 | ~~~~~~~~~~~~~~ | |
|
3 | rhodecode.controllers.error | |
|
4 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
|
5 | 5 | |
|
6 | 6 | RhodeCode error controller |
|
7 | 7 |
@@ -50,7 +50,7 b' class SettingsController(BaseController)' | |||
|
50 | 50 | c.repo_info = repo = repo_model.get_by_repo_name(repo_name) |
|
51 | 51 | if not repo: |
|
52 | 52 | h.flash(_('%s repository is not mapped to db perhaps' |
|
53 | ' it was created or renamed from the filesystem' | |
|
53 | ' it was created or renamed from the file system' | |
|
54 | 54 | ' please run the application again' |
|
55 | 55 | ' in order to rescan repositories') % repo_name, |
|
56 | 56 | category='error') |
@@ -139,7 +139,7 b' class SettingsController(BaseController)' | |||
|
139 | 139 | c.repo_info = repo = repo_model.get_by_repo_name(repo_name) |
|
140 | 140 | if not repo: |
|
141 | 141 | h.flash(_('%s repository is not mapped to db perhaps' |
|
142 | ' it was created or renamed from the filesystem' | |
|
142 | ' it was created or renamed from the file system' | |
|
143 | 143 | ' please run the application again' |
|
144 | 144 | ' in order to rescan repositories') % repo_name, |
|
145 | 145 | category='error') |
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | """ |
|
3 |
|
|
|
4 | ~~~~~~~~~~~~~~ | |
|
3 | rhodecode.controllers.summary | |
|
4 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
|
5 | 5 | |
|
6 | 6 | Summary controller for Rhodecode |
|
7 | 7 |
@@ -113,6 +113,7 b' def action_logger(user, action, repo, ip' | |||
|
113 | 113 | def get_repos(path, recursive=False, initial=False): |
|
114 | 114 | """ |
|
115 | 115 | Scans given path for repos and return (name,(type,path)) tuple |
|
116 | ||
|
116 | 117 | :param prefix: |
|
117 | 118 | :param path: |
|
118 | 119 | :param recursive: |
@@ -137,7 +138,7 b' def get_repos(path, recursive=False, ini' | |||
|
137 | 138 | |
|
138 | 139 | def check_repo_fast(repo_name, base_path): |
|
139 | 140 | """ |
|
140 |
Check given path for exist |
|
|
141 | Check given path for existence of directory | |
|
141 | 142 | :param repo_name: |
|
142 | 143 | :param base_path: |
|
143 | 144 | |
@@ -233,8 +234,8 b" def make_ui(read_from='file', path=None," | |||
|
233 | 234 | |
|
234 | 235 | |
|
235 | 236 | def set_rhodecode_config(config): |
|
236 | """ | |
|
237 | Updates pylons config with new settings from database | |
|
237 | """Updates pylons config with new settings from database | |
|
238 | ||
|
238 | 239 | :param config: |
|
239 | 240 | """ |
|
240 | 241 | from rhodecode.model.settings import SettingsModel |
@@ -244,10 +245,10 b' def set_rhodecode_config(config):' | |||
|
244 | 245 | config[k] = v |
|
245 | 246 | |
|
246 | 247 | def invalidate_cache(cache_key, *args): |
|
247 | """ | |
|
248 | Puts cache invalidation task into db for | |
|
248 | """Puts cache invalidation task into db for | |
|
249 | 249 | further global cache invalidation |
|
250 | 250 | """ |
|
251 | ||
|
251 | 252 | from rhodecode.model.scm import ScmModel |
|
252 | 253 | |
|
253 | 254 | if cache_key.startswith('get_repo_cached_'): |
@@ -269,10 +270,10 b' class EmptyChangeset(BaseChangeset):' | |||
|
269 | 270 | |
|
270 | 271 | @LazyProperty |
|
271 | 272 | def raw_id(self): |
|
272 | """ | |
|
273 | Returns raw string identifying this changeset, useful for web | |
|
273 | """Returns raw string identifying this changeset, useful for web | |
|
274 | 274 | representation. |
|
275 | 275 | """ |
|
276 | ||
|
276 | 277 | return self._empty_cs |
|
277 | 278 | |
|
278 | 279 | @LazyProperty |
@@ -289,8 +290,7 b' class EmptyChangeset(BaseChangeset):' | |||
|
289 | 290 | return 0 |
|
290 | 291 | |
|
291 | 292 | def repo2db_mapper(initial_repo_list, remove_obsolete=False): |
|
292 | """ | |
|
293 | maps all found repositories into db | |
|
293 | """maps all found repositories into db | |
|
294 | 294 | """ |
|
295 | 295 | |
|
296 | 296 | sa = meta.Session() |
@@ -443,10 +443,10 b' def add_cache(settings):' | |||
|
443 | 443 | beaker.cache.cache_regions[region] = region_settings |
|
444 | 444 | |
|
445 | 445 | def get_current_revision(): |
|
446 | """ | |
|
447 | Returns tuple of (number, id) from repository containing this package | |
|
446 | """Returns tuple of (number, id) from repository containing this package | |
|
448 | 447 | or None if repository could not be found. |
|
449 | 448 | """ |
|
449 | ||
|
450 | 450 | try: |
|
451 | 451 | from vcs import get_repo |
|
452 | 452 | from vcs.utils.helpers import get_scm |
General Comments 0
You need to be logged in to leave comments.
Login now