kallithea Changeset - 2fb94c52e20e

Changeset - 2fb94c52e20e

Parent rev.

Child rev.

[Not reviewed]

beta

0 9 0

Marcin Kuzminski - 13 years ago 2013-01-18 01:05:23
marcin@python-works.com

whitespace cleanup

9 files changed with 24 insertions and 27 deletions:

rhodecode/controllers/api/api.py

rhodecode/lib/base.py

rhodecode/templates/admin/repos/repos.html

rhodecode/templates/admin/users/user_edit_my_account.html

rhodecode/templates/admin/users/user_edit_my_account_repos.html

rhodecode/templates/data_table/_dt_elements.html

rhodecode/templates/index_base.html

rhodecode/templates/journal/journal.html

rhodecode/tests/functional/test_home.py

0 comments (0 inline, 0 general)

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -216,13 +216,13 @@ class ApiController(JSONRPCController): @@
         repo = get_repo_or_error(repoid)
         if HasPermissionAnyApi('hg.admin')(user=apiuser):
             pass
         elif HasRepoPermissionAnyApi('repository.admin',
                                      'repository.write')(user=apiuser,
                                                          repo_name=repo.repo_name):
-            #make sure normal user does not pass someone else userid,
             #make sure normal user does not pass someone else userid,
             #he is not allowed to do that
             if not isinstance(userid, Optional) and userid != apiuser.user_id:
                 raise JSONRPCError(
                     'userid is not the same as your user'
+                )
         else:
@@ @@ -267,13 +267,13 @@ class ApiController(JSONRPCController): @@
         Get a user by username, or userid, if userid is given
         :param apiuser:
         :param userid:
         """
         if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
-            #make sure normal user does not pass someone else userid,
             #make sure normal user does not pass someone else userid,
             #he is not allowed to do that
             if not isinstance(userid, Optional) and userid != apiuser.user_id:
                 raise JSONRPCError(
                     'userid is not the same as your user'
+                )

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -41,14 +41,14 @@ def _get_ip_addr(environ): @@
     if ip:
         return ip
     ip = environ.get(proxy_key2)
     if ip:
         # HTTP_X_FORWARDED_FOR can have mutliple ips inside
         # the left-most being the original client, and each successive proxy
         # that passed the request adding the IP address where it received the
         # the left-most being the original client, and each successive proxy
         # that passed the request adding the IP address where it received the
         # request from.
         if ',' in ip:
             ip = ip.split(',')[0].strip()
         return ip
     ip = environ.get(def_key, '0.0.0.0')

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -69,13 +69,13 @@ @@
   var myColumnDefs = [
       {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
       {key:"name",label:"${_('Name')}",sortable:true,
     	  sortOptions: { sortFunction: nameSort }},
       {key:"desc",label:"${_('Description')}",sortable:true},
       {key:"last_changeset",label:"${_('Tip')}",sortable:true,
-          sortOptions: { sortFunction: revisionSort }},
           sortOptions: { sortFunction: revisionSort }},
       {key:"owner",label:"${_('Owner')}",sortable:true},
       {key:"action",label:"${_('Action')}",sortable:false},
   ];
   var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
     sortedBy:{key:"name",dir:"asc"},

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -97,13 +97,13 @@ @@
     <div id="my_container" style="display:none">
         <div class="table yui-skin-sam" id="repos_list_wrap"></div>
         <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
     </div>
     <div id="pullrequests_container" class="table" style="display:none">
         ## loaded via AJAX
-        ${_('Loading...')}
         ${_('Loading...')}
     </div>
 </div>
 <script type="text/javascript">
 var show_perms = function(e){
@@ @@ -199,20 +199,20 @@ function table_renderer(data){ @@
+                  }
+              }
               res.results = filtered;
+          }
           return res;
+      }
 	  // main table sorting
 	  var myColumnDefs = [
 	      {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
 	      {key:"name",label:"${_('Name')}",sortable:true,
 	          sortOptions: { sortFunction: nameSort }},
 	      {key:"last_changeset",label:"${_('Tip')}",sortable:true,
-	          sortOptions: { sortFunction: revisionSort }},
 	          sortOptions: { sortFunction: revisionSort }},
 	      {key:"action",label:"${_('Action')}",sortable:false},
 	  ];
 	  var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
 	    sortedBy:{key:"name",dir:"asc"},
 	    paginator: new YAHOO.widget.Paginator({

rhodecode/templates/admin/users/user_edit_my_account_repos.html

➞

Show inline comments

rhodecode/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -119,13 +119,13 @@ @@
     </div>
     <div style="float:left">
     ${h.form(h.url('repo', repo_name=repo_name),method='delete')}
       ${h.submit('remove_%s' % repo_name,_('delete'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")}
     ${h.end_form()}
     </div>
-  </div>
   </div>
 </%def>
 <%def name="user_actions(user_id, username)">
   ${h.form(h.url('delete_user', id=user_id),method='delete')}
       ${h.submit('remove_',_('delete'),id="remove_user_%s" % user_id,
       class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")}
@@ @@ -138,7 +138,6 @@ @@
 <%def name="toggle_follow(repo_id)">
   <span id="follow_toggle_${repo_id}" class="following" title="${_('Stop following this repository')}"
         onclick="javascript:toggleFollowingRepo(this, ${repo_id},'${str(h.get_token())}')">
   </span>
 </%def>

rhodecode/templates/index_base.html

➞

Show inline comments

@@ @@ -210,13 +210,13 @@ @@
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
           var func = function(node){
               return node.parentNode.parentNode.parentNode.parentNode;
+          }
+          }
           q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func);
       });
     </script>
     % else:
       <script>

rhodecode/templates/journal/journal.html

➞

Show inline comments

@@ @@ -40,13 +40,13 @@ @@
          </ul>
 	    </div>
 	    <div id="journal">${c.journal_data}</div>
     </div>
     <div class="box box-right">
         <!-- box / title -->
         <div class="title">
             <h5>
             <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/>
             <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/>
             </h5>
              <ul class="links" style="color:#DADADA">
@@ @@ -59,20 +59,20 @@ @@
                %if h.HasPermissionAny('hg.admin','hg.create.repository')():
                  <li>
                    <span>${h.link_to(_('Add repo'),h.url('admin_settings_create_repository'))}</span>
                  </li>
                %endif
              </ul>
         </div>
         </div>
         <!-- end box / title -->
         <div id="my_container" style="display:none">
             <div class="table yui-skin-sam" id="repos_list_wrap"></div>
             <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
         <div id="watched_container">
             <div class="table yui-skin-sam" id="watched_repos_list_wrap"></div>
             <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
     </div>
@@ @@ -101,23 +101,23 @@ @@
         ypjax("${h.url.current(filter=c.search_term)}","journal",function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
             });
         YUE.preventDefault(e);
     });
     });
     var show_my = function(e){
         YUD.setStyle('watched_container','display','none');
         YUD.setStyle('my_container','display','');
         YUD.setStyle('q_filter','display','');
         YUD.setStyle('q_filter_watched','display','none');
         YUD.addClass('show_my', 'current');
         YUD.removeClass('show_watched','current');
         if(!YUD.hasClass('show_my', 'loaded')){
             table_renderer(${c.data |n});
             YUD.addClass('show_my', 'loaded');
+        }
+    }
     YUE.on('show_my','click',function(e){
@@ @@ -131,14 +131,14 @@ @@
         YUD.addClass('show_watched', 'current');
         YUD.removeClass('show_my','current');
         if(!YUD.hasClass('show_watched', 'loaded')){
         	watched_renderer(${c.watched_data |n});
             YUD.addClass('show_watched', 'loaded');
+        }
+        }
         return
         var nodes = YUQ('#watched_container .watched_repo a');
         var target = 'q_filter';
         var func = function(node){
             return node.parentNode.parentNode;
+        }
@@ @@ -198,13 +198,13 @@ @@
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
                 sortOptions: { sortFunction: nameSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
-                sortOptions: { sortFunction: revisionSort }},
                 sortOptions: { sortFunction: revisionSort }},
             {key:"action",label:"${_('Action')}",sortable:false},
         ];
         var myDataTable = new YAHOO.widget.DataTable("watched_repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: new YAHOO.widget.Paginator({
@@ @@ -263,13 +263,13 @@ @@
         YUE.on('q_filter_watched','keyup',function (e) {
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter,600);
         });
+      }
     function table_renderer(data){
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
@@ @@ -302,13 +302,13 @@ @@
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
                 sortOptions: { sortFunction: nameSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
-                sortOptions: { sortFunction: revisionSort }},
                 sortOptions: { sortFunction: revisionSort }},
             {key:"action",label:"${_('Action')}",sortable:false},
         ];
         var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: new YAHOO.widget.Paginator({
@@ @@ -366,10 +366,10 @@ @@
          });
         YUE.on('q_filter','keyup',function (e) {
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter,600);
         });
+      }
+      }
     </script>
 </%def>

rhodecode/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -103,7 +103,6 @@ merge" class="tooltip" href="/vcs_test_h @@
             response.mustcontain("""gr1/repo_in_group""")
         finally:
             self._set_l_dash(False)
             RepoModel().delete('gr1/repo_in_group')
             ReposGroupModel().delete(repos_group='gr1', force_delete=True)
             Session().commit()
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)