kallithea Changeset - 68f9c216377d

Changeset - 68f9c216377d

Parent rev.

Child rev.

[Not reviewed]

beta

0 15 0

Marcin Kuzminski - 13 years ago 2013-01-05 02:26:39
marcin@python-works.com

white space cleanup

15 files changed with 19 insertions and 23 deletions:

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

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -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)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -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)

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -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')

rhodecode/model/validators.py

➞

Show inline comments

@@ @@ -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

rhodecode/templates/admin/admin.html

➞

Show inline comments

@@ @@ -53,4 +53,3 @@ YUE.on('filter_form','submit',function(e @@
 fix_j_filter_width(YUD.get('j_filter').value.length);
 </script>
 </%def>

rhodecode/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -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">

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -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');

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -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">

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -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

rhodecode/templates/email_templates/pull_request.html

➞

Show inline comments

@@ @@ -15,5 +15,3 @@ ${body} @@
     <li>${r}</li>
 %endfor
 </ul>

rhodecode/templates/index_base.html

➞

Show inline comments

@@ @@ -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},

rhodecode/templates/journal/journal.html

➞

Show inline comments

@@ @@ -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','');

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -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();
           })

rhodecode/templates/settings/repo_settings.html

➞

Show inline comments

@@ @@ -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>

rhodecode/tests/models/test_user_permissions_on_repos.py

➞

Show inline comments

		#TODO; write tests when we activate algo for permissions.
		\ No newline at end of file
		#TODO; write tests when we activate algo for permissions.

0 comments (0 inline, 0 general)