Show More
@@ -159,11 +159,12 b' class SettingsController(BaseController)' | |||||
159 | form_result = _form.to_python(dict(request.POST)) |
|
159 | form_result = _form.to_python(dict(request.POST)) | |
160 | form_result.update({'repo_name':repo_name}) |
|
160 | form_result.update({'repo_name':repo_name}) | |
161 | repo_model.create_fork(form_result, c.rhodecode_user) |
|
161 | repo_model.create_fork(form_result, c.rhodecode_user) | |
162 |
h.flash(_('fork %s repository as %s |
|
162 | h.flash(_('forked %s repository as %s') \ | |
163 | % (repo_name, form_result['fork_name']), |
|
163 | % (repo_name, form_result['fork_name']), | |
164 | category='success') |
|
164 | category='success') | |
165 |
action_logger(self.rhodecode_user, |
|
165 | action_logger(self.rhodecode_user, | |
166 | repo_name, '', self.sa) |
|
166 | 'user_forked_repo:%s' % form_result['fork_name'], | |
|
167 | repo_name, '', self.sa) | |||
167 | except formencode.Invalid, errors: |
|
168 | except formencode.Invalid, errors: | |
168 | c.new_repo = errors.value['fork_name'] |
|
169 | c.new_repo = errors.value['fork_name'] | |
169 | r = render('settings/repo_fork.html') |
|
170 | r = render('settings/repo_fork.html') |
@@ -396,37 +396,51 b' def action_parser(user_log):' | |||||
396 | """ |
|
396 | """ | |
397 | action = user_log.action |
|
397 | action = user_log.action | |
398 | action_params = None |
|
398 | action_params = None | |
399 | cs_links = '' |
|
|||
400 |
|
399 | |||
401 | x = action.split(':') |
|
400 | x = action.split(':') | |
402 |
|
401 | |||
403 | if len(x) > 1: |
|
402 | if len(x) > 1: | |
404 | action, action_params = x |
|
403 | action, action_params = x | |
405 |
|
404 | |||
406 | if action == 'push': |
|
405 | def get_cs_links(): | |
407 | revs_limit = 5 |
|
406 | if action == 'push': | |
408 | revs = action_params.split(',') |
|
407 | revs_limit = 5 | |
409 | cs_links = " " + ', '.join ([link(rev, |
|
408 | revs = action_params.split(',') | |
410 | url('changeset_home', |
|
409 | cs_links = " " + ', '.join ([link(rev, | |
411 | repo_name=user_log.repository.repo_name, |
|
410 | url('changeset_home', | |
412 | revision=rev)) for rev in revs[:revs_limit] ]) |
|
411 | repo_name=user_log.repository.repo_name, | |
413 | if len(revs) > revs_limit: |
|
412 | revision=rev)) for rev in revs[:revs_limit] ]) | |
414 | html_tmpl = '<span title="%s"> %s </span>' |
|
413 | if len(revs) > revs_limit: | |
415 | cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]), |
|
414 | html_tmpl = '<span title="%s"> %s </span>' | |
416 | _('and %s more revisions') % (len(revs) - revs_limit)) |
|
415 | cs_links += html_tmpl % (', '.join(r for r in revs[revs_limit:]), | |
417 |
|
416 | _('and %s more revisions') \ | ||
|
417 | % (len(revs) - revs_limit)) | |||
|
418 | ||||
|
419 | return literal(cs_links) | |||
|
420 | return '' | |||
|
421 | ||||
|
422 | def get_fork_name(): | |||
|
423 | if action == 'user_forked_repo': | |||
|
424 | from rhodecode.model.scm import ScmModel | |||
|
425 | repo_name = action_params | |||
|
426 | repo = ScmModel().get(repo_name) | |||
|
427 | if repo is None: | |||
|
428 | return repo_name | |||
|
429 | return link_to(action_params, url('summary_home', | |||
|
430 | repo_name=repo.name,), | |||
|
431 | title=repo.dbrepo.description) | |||
|
432 | return '' | |||
418 | map = {'user_deleted_repo':_('User deleted repository'), |
|
433 | map = {'user_deleted_repo':_('User deleted repository'), | |
419 | 'user_created_repo':_('User created repository'), |
|
434 | 'user_created_repo':_('User created repository'), | |
420 | 'user_forked_repo':_('User forked repository'), |
|
435 | 'user_forked_repo':_('User forked repository as: ') + get_fork_name(), | |
421 | 'user_updated_repo':_('User updated repository'), |
|
436 | 'user_updated_repo':_('User updated repository'), | |
422 | 'admin_deleted_repo':_('Admin delete repository'), |
|
437 | 'admin_deleted_repo':_('Admin delete repository'), | |
423 | 'admin_created_repo':_('Admin created repository'), |
|
438 | 'admin_created_repo':_('Admin created repository'), | |
424 | 'admin_forked_repo':_('Admin forked repository'), |
|
439 | 'admin_forked_repo':_('Admin forked repository'), | |
425 | 'admin_updated_repo':_('Admin updated repository'), |
|
440 | 'admin_updated_repo':_('Admin updated repository'), | |
426 |
'push':_('Pushed') + |
|
441 | 'push':_('Pushed') + get_cs_links(), | |
427 | 'pull':_('Pulled'), } |
|
442 | 'pull':_('Pulled'), } | |
428 |
|
443 | |||
429 | print action, action_params |
|
|||
430 | return map.get(action, action) |
|
444 | return map.get(action, action) | |
431 |
|
445 | |||
432 |
|
446 |
@@ -24,6 +24,17 b'' | |||||
24 | <div class="ui-tabs-panel ui-widget-content ui-corner-bottom"> |
|
24 | <div class="ui-tabs-panel ui-widget-content ui-corner-bottom"> | |
25 | ${h.form(url('admin_settings_my_account_update'),method='put')} |
|
25 | ${h.form(url('admin_settings_my_account_update'),method='put')} | |
26 | <div class="form"> |
|
26 | <div class="form"> | |
|
27 | ||||
|
28 | <div class="field"> | |||
|
29 | <div class="gravatar_box"> | |||
|
30 | <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> | |||
|
31 | <p> | |||
|
32 | <strong>Change your avatar at <a href="http://gravatar.com">gravatar.com</a></strong><br/> | |||
|
33 | ${_('Using')} ${c.user.email} | |||
|
34 | </p> | |||
|
35 | </div> | |||
|
36 | </div> | |||
|
37 | ||||
27 | <div class="fields"> |
|
38 | <div class="fields"> | |
28 | <div class="field"> |
|
39 | <div class="field"> | |
29 | <div class="label"> |
|
40 | <div class="label"> | |
@@ -86,7 +97,7 b'' | |||||
86 | <div class="box box-right"> |
|
97 | <div class="box box-right"> | |
87 | <!-- box / title --> |
|
98 | <!-- box / title --> | |
88 | <div class="title"> |
|
99 | <div class="title"> | |
89 | <h5>${_('My repositories')} |
|
100 | <h5>${_('My repositories')} | |
90 | <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> |
|
101 | <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/> | |
91 | </h5> |
|
102 | </h5> | |
92 | </div> |
|
103 | </div> |
General Comments 0
You need to be logged in to leave comments.
Login now