Mercurial > kallithea
changeset 4726:f1e0b8aa634b
minor fixes
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 06 Jan 2015 00:54:36 +0100 |
| parents | d32fe5348b5e |
| children | 9cf229b46e49 |
| files | kallithea/controllers/admin/users.py kallithea/controllers/files.py kallithea/lib/db_manage.py kallithea/model/validators.py kallithea/public/js/base.js kallithea/public/js/pyroutes_map.js kallithea/templates/changeset/diff_block.html |
| diffstat | 7 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/users.py Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/controllers/admin/users.py Tue Jan 06 00:54:36 2015 +0100 @@ -94,9 +94,8 @@ .render(user_id, username, _=_, h=h, c=c)) for user in c.users_list: - users_data.append({ - "gravatar": grav_tmpl(user. email, 20), + "gravatar": grav_tmpl(user.email, 20), "raw_name": user.username, "username": username(user.user_id, user.username), "firstname": user.name,
--- a/kallithea/controllers/files.py Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/controllers/files.py Tue Jan 06 00:54:36 2015 +0100 @@ -190,7 +190,7 @@ return render('files/files_ypjax.html') # TODO: tags and bookmarks? - c.revision_options = [(c.changeset.raw_id, + c.revision_options = [(c.changeset.raw_id, _('%s at %s') % (c.changeset.branch, h.short_id(c.changeset.raw_id)))] + \ [(n, b) for b, n in c.db_repo_scm_instance.branches.items()] if c.db_repo_scm_instance.closed_branches:
--- a/kallithea/lib/db_manage.py Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/lib/db_manage.py Tue Jan 06 00:54:36 2015 +0100 @@ -286,7 +286,6 @@ def create_ui_settings(self, repo_store_path): """ Creates ui settings, fills out hooks - and disables dotencode """ #HOOKS
--- a/kallithea/model/validators.py Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/model/validators.py Tue Jan 06 00:54:36 2015 +0100 @@ -87,7 +87,7 @@ value = aslist(value, ',') seen = set() return [c for c in value if not (c in seen or seen.add(c))] - + def empty_value(self, value): return []
--- a/kallithea/public/js/base.js Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/public/js/base.js Tue Jan 06 00:54:36 2015 +0100 @@ -669,16 +669,16 @@ if(lineno === undefined){ alert('Error submitting, line ' + lineno + ' not found.'); - return + return; } if(f_path === undefined){ alert('Error submitting, file path ' + f_path + ' not found.'); - return + return; } var text = $('#text_'+lineno).val(); if(text == ""){ - return + return; } $overlay.show();
--- a/kallithea/public/js/pyroutes_map.js Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/public/js/pyroutes_map.js Tue Jan 06 00:54:36 2015 +0100 @@ -1,10 +1,10 @@ //Format is key == name // "mark_error_fixed": [ # key -// "/mark_error_fixed/%(error_id)s", #url template -// [ +// "/mark_error_fixed/%(error_id)s", #url template +// [ // "error_id" # list of args // ] -// ], +// ], // var PROUTES_MAP = {
--- a/kallithea/templates/changeset/diff_block.html Tue Jan 06 00:54:36 2015 +0100 +++ b/kallithea/templates/changeset/diff_block.html Tue Jan 06 00:54:36 2015 +0100 @@ -140,7 +140,7 @@ }) .show(); }); - + $('.btn-image-diff-swap').mousedown(function(e){ $('#'+e.currentTarget.id+'-img-a.img-diff-swapable') .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));