# HG changeset patch # User Marcin Kuzminski # Date 2013-01-05 02:26:39 # Node ID 68f9c216377d2376c46acb953c011980014238db # Parent b31984972e95aeb13dce379a4b61b29943429b1a white space cleanup diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -97,7 +97,7 @@ class PullrequestsController(BaseRepoCon return repo.branches.keys()[0] def _get_is_allowed_change_status(self, pull_request): - owner = self.rhodecode_user.user_id == pull_request.user_id + owner = self.rhodecode_user.user_id == pull_request.user_id reviewer = self.rhodecode_user.user_id in [x.user_id for x in pull_request.reviewers] return (self.rhodecode_user.admin or owner or reviewer) diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -1170,4 +1170,3 @@ def ip_range(ip_addr): from rhodecode.model.db import UserIpMap s, e = UserIpMap._get_ip_range(ip_addr) return '%s - %s' % (s, e) - diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -751,4 +751,4 @@ def jsonify(func, *args, **kwargs): warnings.warn(msg, Warning, 2) log.warning(msg) log.debug("Returning JSON wrapped action output") - return json.dumps(data, encoding='utf-8') \ No newline at end of file + return json.dumps(data, encoding='utf-8') diff --git a/rhodecode/model/validators.py b/rhodecode/model/validators.py --- a/rhodecode/model/validators.py +++ b/rhodecode/model/validators.py @@ -566,7 +566,7 @@ def ValidPerms(type_='repo'): def ValidSettings(): class _validator(formencode.validators.FancyValidator): def _to_python(self, value, state): - # settings form for users that are not admin + # settings form for users that are not admin # can't edit certain parameters, it's extra backup if they mangle # with forms diff --git a/rhodecode/templates/admin/admin.html b/rhodecode/templates/admin/admin.html --- a/rhodecode/templates/admin/admin.html +++ b/rhodecode/templates/admin/admin.html @@ -53,4 +53,3 @@ YUE.on('filter_form','submit',function(e fix_j_filter_width(YUD.get('j_filter').value.length); - diff --git a/rhodecode/templates/admin/admin_log.html b/rhodecode/templates/admin/admin_log.html --- a/rhodecode/templates/admin/admin_log.html +++ b/rhodecode/templates/admin/admin_log.html @@ -16,7 +16,7 @@ ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))} %else: ${l.username} - %endif + %endif ${h.action_parser(l)[0]()}
diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html --- a/rhodecode/templates/base/root.html +++ b/rhodecode/templates/base/root.html @@ -74,7 +74,7 @@ return false; } })(window); - + YUE.onDOMReady(function(){ tooltip_activate(); show_more_event(); @@ -83,7 +83,7 @@ YUE.on('quick_login_link','click',function(e){ // make sure we don't redirect YUE.preventDefault(e); - + if(YUD.hasClass('quick_login_link','enabled')){ YUD.setStyle('quick_login','display','none'); YUD.removeClass('quick_login_link','enabled'); diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -40,7 +40,7 @@ %endfor %else: ${_('No parents')} - %endif + %endif
%if c.changeset.children: @@ -50,10 +50,10 @@ %endfor %else: ${_('No children')} - %endif -
+ %endif +
${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}
- +
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -130,7 +130,7 @@