Show More
@@ -218,7 +218,7 b' class ReposController(BaseController):' | |||||
218 | form_result = _form.to_python(dict(request.POST)) |
|
218 | form_result = _form.to_python(dict(request.POST)) | |
219 | repo = repo_model.update(repo_name, form_result) |
|
219 | repo = repo_model.update(repo_name, form_result) | |
220 | invalidate_cache('get_repo_cached_%s' % repo_name) |
|
220 | invalidate_cache('get_repo_cached_%s' % repo_name) | |
221 |
h.flash(_('Repository %s updated successfully' % repo_name |
|
221 | h.flash(_('Repository %s updated successfully') % repo_name, | |
222 | category='success') |
|
222 | category='success') | |
223 | changed_name = repo.repo_name |
|
223 | changed_name = repo.repo_name | |
224 | action_logger(self.rhodecode_user, 'admin_updated_repo', |
|
224 | action_logger(self.rhodecode_user, 'admin_updated_repo', | |
@@ -414,7 +414,7 b' class ReposController(BaseController):' | |||||
414 | self.rhodecode_user.username) |
|
414 | self.rhodecode_user.username) | |
415 | fork = repo.fork.repo_name if repo.fork else _('Nothing') |
|
415 | fork = repo.fork.repo_name if repo.fork else _('Nothing') | |
416 | Session.commit() |
|
416 | Session.commit() | |
417 |
h.flash(_('Marked repo %s as fork of %s' % (repo_name,fork) |
|
417 | h.flash(_('Marked repo %s as fork of %s') % (repo_name,fork), | |
418 | category='success') |
|
418 | category='success') | |
419 | except Exception, e: |
|
419 | except Exception, e: | |
420 | raise |
|
420 | raise |
@@ -195,14 +195,14 b' class ReposGroupsController(BaseControll' | |||||
195 | repos = gr.repositories.all() |
|
195 | repos = gr.repositories.all() | |
196 | if repos: |
|
196 | if repos: | |
197 | h.flash(_('This group contains %s repositores and cannot be ' |
|
197 | h.flash(_('This group contains %s repositores and cannot be ' | |
198 |
'deleted' % len(repos) |
|
198 | 'deleted') % len(repos), | |
199 | category='error') |
|
199 | category='error') | |
200 | return redirect(url('repos_groups')) |
|
200 | return redirect(url('repos_groups')) | |
201 |
|
201 | |||
202 | try: |
|
202 | try: | |
203 | ReposGroupModel().delete(id) |
|
203 | ReposGroupModel().delete(id) | |
204 | Session.commit() |
|
204 | Session.commit() | |
205 |
h.flash(_('removed repos group %s' % gr.group_name |
|
205 | h.flash(_('removed repos group %s') % gr.group_name, category='success') | |
206 | #TODO: in future action_logger(, '', '', '', self.sa) |
|
206 | #TODO: in future action_logger(, '', '', '', self.sa) | |
207 | except IntegrityError, e: |
|
207 | except IntegrityError, e: | |
208 | if e.message.find('groups_group_parent_id_fkey') != -1: |
|
208 | if e.message.find('groups_group_parent_id_fkey') != -1: | |
@@ -213,12 +213,12 b' class ReposGroupsController(BaseControll' | |||||
213 | else: |
|
213 | else: | |
214 | log.error(traceback.format_exc()) |
|
214 | log.error(traceback.format_exc()) | |
215 | h.flash(_('error occurred during deletion of repos ' |
|
215 | h.flash(_('error occurred during deletion of repos ' | |
216 |
'group %s' % gr.group_name |
|
216 | 'group %s') % gr.group_name, category='error') | |
217 |
|
217 | |||
218 | except Exception: |
|
218 | except Exception: | |
219 | log.error(traceback.format_exc()) |
|
219 | log.error(traceback.format_exc()) | |
220 | h.flash(_('error occurred during deletion of repos ' |
|
220 | h.flash(_('error occurred during deletion of repos ' | |
221 |
'group %s' % gr.group_name |
|
221 | 'group %s') % gr.group_name, category='error') | |
222 |
|
222 | |||
223 | return redirect(url('repos_groups')) |
|
223 | return redirect(url('repos_groups')) | |
224 |
|
224 |
@@ -232,7 +232,7 b' class UsersController(BaseController):' | |||||
232 | try: |
|
232 | try: | |
233 | user_model.add_extra_email(id, email) |
|
233 | user_model.add_extra_email(id, email) | |
234 | Session.commit() |
|
234 | Session.commit() | |
235 |
h.flash(_("Added email %s to user" % email |
|
235 | h.flash(_("Added email %s to user") % email, category='success') | |
236 | except formencode.Invalid, error: |
|
236 | except formencode.Invalid, error: | |
237 | msg = error.error_dict['email'] |
|
237 | msg = error.error_dict['email'] | |
238 | h.flash(msg, category='error') |
|
238 | h.flash(msg, category='error') |
@@ -82,7 +82,7 b' class FilesController(BaseRepoController' | |||||
82 | repo_name=c.repo_name, |
|
82 | repo_name=c.repo_name, | |
83 | revision=0, f_path='') |
|
83 | revision=0, f_path='') | |
84 | add_new = '<a href="%s">[%s]</a>' % (url_, _('add new')) |
|
84 | add_new = '<a href="%s">[%s]</a>' % (url_, _('add new')) | |
85 |
h.flash(h.literal(_('There are no files yet %s' % add_new) |
|
85 | h.flash(h.literal(_('There are no files yet %s') % add_new), | |
86 | category='warning') |
|
86 | category='warning') | |
87 | redirect(h.url('summary_home', repo_name=repo_name)) |
|
87 | redirect(h.url('summary_home', repo_name=repo_name)) | |
88 |
|
88 | |||
@@ -267,7 +267,7 b' class FilesController(BaseRepoController' | |||||
267 | user=self.rhodecode_user, |
|
267 | user=self.rhodecode_user, | |
268 | author=author, message=message, |
|
268 | author=author, message=message, | |
269 | content=content, f_path=f_path) |
|
269 | content=content, f_path=f_path) | |
270 |
h.flash(_('Successfully committed to %s' % f_path |
|
270 | h.flash(_('Successfully committed to %s') % f_path, | |
271 | category='success') |
|
271 | category='success') | |
272 |
|
272 | |||
273 | except Exception: |
|
273 | except Exception: | |
@@ -321,7 +321,7 b' class FilesController(BaseRepoController' | |||||
321 | user=self.rhodecode_user, |
|
321 | user=self.rhodecode_user, | |
322 | author=author, message=message, |
|
322 | author=author, message=message, | |
323 | content=content, f_path=node_path) |
|
323 | content=content, f_path=node_path) | |
324 |
h.flash(_('Successfully committed to %s' % node_path |
|
324 | h.flash(_('Successfully committed to %s') % node_path, | |
325 | category='success') |
|
325 | category='success') | |
326 | except NodeAlreadyExistsError, e: |
|
326 | except NodeAlreadyExistsError, e: | |
327 | h.flash(_(e), category='error') |
|
327 | h.flash(_(e), category='error') |
@@ -133,7 +133,7 b' class PullrequestsController(BaseRepoCon' | |||||
133 | for u in User.query().filter(User.username != 'default').all(): |
|
133 | for u in User.query().filter(User.username != 'default').all(): | |
134 | uname = u.username |
|
134 | uname = u.username | |
135 | if org_repo.user == u: |
|
135 | if org_repo.user == u: | |
136 |
uname = _('%s (owner)' % u.username |
|
136 | uname = _('%s (owner)') % u.username | |
137 | # auto add owner to pull-request recipients |
|
137 | # auto add owner to pull-request recipients | |
138 | c.review_members.append([u.user_id, uname]) |
|
138 | c.review_members.append([u.user_id, uname]) | |
139 | c.available_members.append([u.user_id, uname]) |
|
139 | c.available_members.append([u.user_id, uname]) |
@@ -104,7 +104,7 b' class SettingsController(BaseRepoControl' | |||||
104 |
|
104 | |||
105 | repo_model.update(repo_name, form_result) |
|
105 | repo_model.update(repo_name, form_result) | |
106 | invalidate_cache('get_repo_cached_%s' % repo_name) |
|
106 | invalidate_cache('get_repo_cached_%s' % repo_name) | |
107 |
h.flash(_('Repository %s updated successfully' % repo_name |
|
107 | h.flash(_('Repository %s updated successfully') % repo_name, | |
108 | category='success') |
|
108 | category='success') | |
109 | changed_name = form_result['repo_name_full'] |
|
109 | changed_name = form_result['repo_name_full'] | |
110 | action_logger(self.rhodecode_user, 'user_updated_repo', |
|
110 | action_logger(self.rhodecode_user, 'user_updated_repo', |
@@ -129,8 +129,8 b'' | |||||
129 | </div> |
|
129 | </div> | |
130 |
|
130 | |||
131 | <div class="buttons"> |
|
131 | <div class="buttons"> | |
132 | ${h.submit('save','Save',class_="ui-button")} |
|
132 | ${h.submit('save',_('Save'),class_="ui-button")} | |
133 | ${h.reset('reset','Reset',class_="ui-button")} |
|
133 | ${h.reset('reset',_('Reset'),class_="ui-button")} | |
134 | </div> |
|
134 | </div> | |
135 | </div> |
|
135 | </div> | |
136 | </div> |
|
136 | </div> |
General Comments 0
You need to be logged in to leave comments.
Login now