Mercurial > kallithea
changeset 3149:68f9c216377d beta
white space cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 05 Jan 2013 02:26:39 +0100 |
| parents | b31984972e95 |
| children | 80abc924a38c |
| files | rhodecode/controllers/pullrequests.py rhodecode/lib/helpers.py rhodecode/lib/utils.py rhodecode/model/validators.py rhodecode/templates/admin/admin.html rhodecode/templates/admin/admin_log.html rhodecode/templates/base/root.html rhodecode/templates/changeset/changeset.html rhodecode/templates/changeset/changeset_file_comment.html rhodecode/templates/email_templates/pull_request.html rhodecode/templates/index_base.html rhodecode/templates/journal/journal.html rhodecode/templates/pullrequests/pullrequest_show.html rhodecode/templates/settings/repo_settings.html rhodecode/tests/models/test_user_permissions_on_repos.py |
| diffstat | 15 files changed, 19 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/controllers/pullrequests.py Sat Jan 05 02:26:39 2013 +0100 @@ -97,7 +97,7 @@ 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)
--- a/rhodecode/lib/helpers.py Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/lib/helpers.py Sat Jan 05 02:26:39 2013 +0100 @@ -1170,4 +1170,3 @@ from rhodecode.model.db import UserIpMap s, e = UserIpMap._get_ip_range(ip_addr) return '%s - %s' % (s, e) -
--- a/rhodecode/lib/utils.py Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/lib/utils.py Sat Jan 05 02:26:39 2013 +0100 @@ -751,4 +751,4 @@ 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')
--- a/rhodecode/model/validators.py Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/model/validators.py Sat Jan 05 02:26:39 2013 +0100 @@ -566,7 +566,7 @@ 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
--- a/rhodecode/templates/admin/admin.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/admin/admin.html Sat Jan 05 02:26:39 2013 +0100 @@ -53,4 +53,3 @@ fix_j_filter_width(YUD.get('j_filter').value.length); </script> </%def> -
--- a/rhodecode/templates/admin/admin_log.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/admin/admin_log.html Sat Jan 05 02:26:39 2013 +0100 @@ -16,7 +16,7 @@ ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))} %else: ${l.username} - %endif + %endif </td> <td>${h.action_parser(l)[0]()} <div class="journal_action_params">
--- a/rhodecode/templates/base/root.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/base/root.html Sat Jan 05 02:26:39 2013 +0100 @@ -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');
--- a/rhodecode/templates/changeset/changeset.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/changeset/changeset.html Sat Jan 05 02:26:39 2013 +0100 @@ -40,7 +40,7 @@ %endfor %else: <span>${_('No parents')}</span> - %endif + %endif </div> <div class="children"> %if c.changeset.children: @@ -50,10 +50,10 @@ %endfor %else: <span>${_('No children')}</span> - %endif - </div> + %endif + </div> <div class="code-header banner"> - + <div class="hash"> r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} </div> @@ -74,7 +74,7 @@ ${c.context_url(request.GET)} </div> <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div> - </div> + </div> </div> <div id="changeset_content"> <div class="container">
--- a/rhodecode/templates/changeset/changeset_file_comment.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/changeset/changeset_file_comment.html Sat Jan 05 02:26:39 2013 +0100 @@ -130,7 +130,7 @@ <div id="status_block_container" class="status-block" style="display:none"> %for status,lbl in c.changeset_statuses: <div class=""> - <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}"> + <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}"> <label for="${status}">${lbl}</label> </div> %endfor
--- a/rhodecode/templates/email_templates/pull_request.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/email_templates/pull_request.html Sat Jan 05 02:26:39 2013 +0100 @@ -15,5 +15,3 @@ <li>${r}</li> %endfor </ul> - -
--- a/rhodecode/templates/index_base.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/index_base.html Sat Jan 05 02:26:39 2013 +0100 @@ -268,7 +268,7 @@ {key:"last_change",label:"${_('Last Change')}",sortable:true, sortOptions: { sortFunction: ageSort }}, {key:"tip",label:"${_('Tip')}",sortable:true, - sortOptions: { sortFunction: revisionSort }}, + sortOptions: { sortFunction: revisionSort }}, {key:"owner",label:"${_('Owner')}",sortable:true}, {key:"rss",label:"",sortable:false}, {key:"atom",label:"",sortable:false},
--- a/rhodecode/templates/journal/journal.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/journal/journal.html Sat Jan 05 02:26:39 2013 +0100 @@ -114,7 +114,7 @@ </div> <script type="text/javascript"> - + YUE.on('j_filter','click',function(){ var jfilter = YUD.get('j_filter'); if(YUD.hasClass(jfilter, 'initial')){ @@ -132,8 +132,8 @@ var val = YUD.get('j_filter').value; window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val); }); - fix_j_filter_width(YUD.get('j_filter').value.length); - + fix_j_filter_width(YUD.get('j_filter').value.length); + var show_my = function(e){ YUD.setStyle('watched','display','none'); YUD.setStyle('my','display','');
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Sat Jan 05 02:26:39 2013 +0100 @@ -198,7 +198,7 @@ // inject comments into they proper positions var file_comments = YUQ('.inline-comment-placeholder'); renderInlineComments(file_comments); - + YUE.on(YUD.get('update_pull_request'),'click',function(e){ updateReviewers(); })
--- a/rhodecode/templates/settings/repo_settings.html Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/templates/settings/repo_settings.html Sat Jan 05 02:26:39 2013 +0100 @@ -94,7 +94,7 @@ ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} </div> - + </div> ${h.end_form()} </div>
--- a/rhodecode/tests/models/test_user_permissions_on_repos.py Sat Jan 05 02:20:35 2013 +0100 +++ b/rhodecode/tests/models/test_user_permissions_on_repos.py Sat Jan 05 02:26:39 2013 +0100 @@ -1,1 +1,1 @@ -#TODO; write tests when we activate algo for permissions. \ No newline at end of file +#TODO; write tests when we activate algo for permissions.