# HG changeset patch # User Søren Løvborg # Date 1486764177 -3600 # Node ID 3c720eeaca89c44dd6c231b6bfba71d4d29b4685 # Parent 9059da57b431417d50703398e1653d3aa7008065 compare: refactor drop-down UI code Don't rely on fake ref_names in the controller; instead put the code in the HTML together with the other UI code. diff -r 9059da57b431 -r 3c720eeaca89 kallithea/controllers/compare.py --- a/kallithea/controllers/compare.py Wed Mar 15 22:07:53 2017 +0100 +++ b/kallithea/controllers/compare.py Fri Feb 10 23:02:57 2017 +0100 @@ -170,7 +170,7 @@ @HasRepoPermissionLevelDecorator('read') def index(self, repo_name): c.compare_home = True - c.a_ref_name = c.cs_ref_name = _('Select changeset') + c.a_ref_name = c.cs_ref_name = None return render('compare/compare_diff.html') @LoginRequired() diff -r 9059da57b431 -r 3c720eeaca89 kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html Wed Mar 15 22:07:53 2017 +0100 +++ b/kallithea/templates/compare/compare_diff.html Fri Feb 10 23:02:57 2017 +0100 @@ -101,9 +101,9 @@ $(document).ready(function(){ var cache = {}; - function make_revision_dropdown(css_selector, placeholder, repo_name, cache_key) { + function make_revision_dropdown(css_selector, repo_name, ref_name, cache_key) { $(css_selector).select2({ - placeholder: placeholder, + placeholder: '{0}@{1}'.format(repo_name, ref_name || ${h.jshtml(_('Select changeset'))}), formatSelection: function(obj){ return '{0}@{1}'.format(repo_name, obj.text); }, @@ -149,8 +149,8 @@ }); } - make_revision_dropdown("#compare_org", ${h.jshtml('%s@%s' % (c.a_repo.repo_name, c.a_ref_name))}, ${h.jshtml(c.a_repo.repo_name)}, 'cache'); - make_revision_dropdown("#compare_other", ${h.jshtml('%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name))}, ${h.jshtml(c.cs_repo.repo_name)}, 'cache2'); + make_revision_dropdown("#compare_org", ${h.jshtml(c.a_repo.repo_name)}, ${h.jshtml(c.a_ref_name)}, 'cache'); + make_revision_dropdown("#compare_other", ${h.jshtml(c.cs_repo.repo_name)}, ${h.jshtml(c.cs_ref_name)}, 'cache2'); var values_changed = function() { var values = $('#compare_org').select2('data') && $('#compare_other').select2('data');