diff --git a/rhodecode/controllers/admin/repos_groups.py b/rhodecode/controllers/admin/repos_groups.py --- a/rhodecode/controllers/admin/repos_groups.py +++ b/rhodecode/controllers/admin/repos_groups.py @@ -342,8 +342,8 @@ class ReposGroupsController(BaseControll "sort": "name", "dir": "asc", "records": repos_data - }) - + }) + return render('admin/repos_groups/repos_groups.html') @HasPermissionAnyDecorator('hg.admin') diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py --- a/rhodecode/controllers/files.py +++ b/rhodecode/controllers/files.py @@ -157,7 +157,7 @@ class FilesController(BaseRepoController _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path) c.file_changeset = c.changeset if _hist: - c.file_changeset = (c.changeset + c.file_changeset = (c.changeset if c.changeset.revision < _hist[0].revision else _hist[0]) c.file_history = self._get_node_history(None, f_path, _hist) diff --git a/rhodecode/lib/middleware/errormator.py b/rhodecode/lib/middleware/errormator.py --- a/rhodecode/lib/middleware/errormator.py +++ b/rhodecode/lib/middleware/errormator.py @@ -28,4 +28,4 @@ try: except ImportError: Errormator = None else: - Errormator = make_errormator_middleware \ No newline at end of file + Errormator = make_errormator_middleware diff --git a/rhodecode/lib/middleware/sentry.py b/rhodecode/lib/middleware/sentry.py --- a/rhodecode/lib/middleware/sentry.py +++ b/rhodecode/lib/middleware/sentry.py @@ -44,4 +44,4 @@ else: include_paths=list_from_setting(config, 'sentry.include_paths'), exclude_paths=list_from_setting(config, 'sentry.exclude_paths'), ) - super(Sentry, self).__init__(app, client) \ No newline at end of file + super(Sentry, self).__init__(app, client) diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -35,7 +35,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
- + %if c.rhodecode_db_repo.fork: ${_('Compare fork')} %endif @@ -161,11 +161,11 @@ ${_('%s Changelog') % c.repo_name} - ${c if(checked_checkboxes.length>0){ // modify open pull request to show we have selected cs YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; - + }else{ - YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; + YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; } - + if(checked_checkboxes.length>1){ var rev_end = checked_checkboxes[0].name; var rev_start = checked_checkboxes[checked_checkboxes.length-1].name; @@ -188,9 +188,9 @@ ${_('%s Changelog') % c.repo_name} - ${c if (rev == rev_start){ checked = false; } - + } - + var url = url_tmpl.replace('__REVRANGE__', rev_start+'...'+rev_end); @@ -201,7 +201,7 @@ ${_('%s Changelog') % c.repo_name} - ${c YUD.get('rev_range_container').innerHTML = link; YUD.setStyle('rev_range_container','display',''); YUD.setStyle('rev_range_clear','display',''); - + } else{ YUD.setStyle('rev_range_container','display','none'); diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -94,8 +94,8 @@ ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} %endfor - -
+ + ${diff_block.diff_block(c.changes[cs.raw_id])} ##${comment.comments(cs)} diff --git a/rhodecode/templates/followers/followers_data.html b/rhodecode/templates/followers/followers_data.html --- a/rhodecode/templates/followers/followers_data.html +++ b/rhodecode/templates/followers/followers_data.html @@ -22,7 +22,7 @@ YUE.onDOMReady(function(){ ypjax(e.target.href,"followers",function(){ show_more_event(); tooltip_activate(); - show_changeset_tooltip(); + show_changeset_tooltip(); }); YUE.preventDefault(e); },'.pager_link'); diff --git a/rhodecode/templates/forks/forks_data.html b/rhodecode/templates/forks/forks_data.html --- a/rhodecode/templates/forks/forks_data.html +++ b/rhodecode/templates/forks/forks_data.html @@ -30,7 +30,7 @@ ypjax(e.target.href,"forks",function(){ show_more_event(); tooltip_activate(); - show_changeset_tooltip(); + show_changeset_tooltip(); }); YUE.preventDefault(e); },'.pager_link'); diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html --- a/rhodecode/templates/index_base.html +++ b/rhodecode/templates/index_base.html @@ -163,7 +163,7 @@ firstPageLinkLabel: '<<', lastPageLinkLabel: '>>', containers:['user-paginator'] - }), + }), MSG_SORTASC:"${_('Click to sort ascending')}", MSG_SORTDESC:"${_('Click to sort descending')}" }); @@ -224,7 +224,7 @@ var data = ${c.data|n}; var myDataSource = new YAHOO.util.DataSource(data); myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - + myDataSource.responseSchema = { resultsList: "records", fields: [ @@ -243,7 +243,7 @@ var data = res.results || [], filtered = [], i,l; - + if (req) { req = req.toLowerCase(); for (i = 0; i % endif - \ No newline at end of file diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html --- a/rhodecode/templates/journal/journal.html +++ b/rhodecode/templates/journal/journal.html @@ -38,7 +38,7 @@
- ${_('Watched')} / ${_('My repos')} + ${_('Watched')} / ${_('My repos')}
%if h.HasPermissionAny('hg.admin','hg.create.repository')():
- %endif \ No newline at end of file + %endif diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -73,7 +73,7 @@
% if c.files:
${_('Files affected')}
-
+
%for fid, change, f, stat in c.files:
${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -63,15 +63,15 @@ %endif %endif: - + ## locking icon %if c.rhodecode_db_repo.enable_locking: %if c.rhodecode_db_repo.locked[0]: - + %else: %endif - %endif + %endif ##REPO TYPE %if h.is_hg(c.dbrepo): ${_('Mercurial repository')} diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py --- a/rhodecode/tests/functional/test_home.py +++ b/rhodecode/tests/functional/test_home.py @@ -76,4 +76,3 @@ merge" class="tooltip" href="/vcs_test_h response.mustcontain("""var data = {"totalRecords": %s""" % len(Repository.getAll())) finally: set_l_dash(False) -