Changeset - ce9a226e0867
Parent rev.
Child rev.
[Not reviewed]
beta
0 4 0
Mads Kiilerich - 13 years ago 2013-03-28 01:10:45
madski@unity3d.com
sort permission lists by (repository) name

This also exhibits too much code in templates and code/template duplication.
4 files changed with 4 insertions and 4 deletions:
rhodecode/templates/admin/permissions/permissions.html
1
1
rhodecode/templates/admin/users/user_edit.html
1
1
rhodecode/templates/admin/users/user_edit_my_account.html
1
1
rhodecode/templates/admin/users_groups/users_group_edit.html
1
1
0 comments (0 inline, 0 general)
rhodecode/templates/admin/permissions/permissions.html
➞
Show inline comments
 
@@ -74,97 +74,97 @@
 
            </div>
 
             <div class="field">
 
                <div class="label">
 
                    <label for="default_create">${_('Repository creation')}:</label>
 
                </div>
 
                <div class="select">
 
                    ${h.select('default_create','',c.create_choices)}
 
                </div>
 
             </div>
 
             <div class="field">
 
                <div class="label">
 
                    <label for="default_fork">${_('Repository forking')}:</label>
 
                </div>
 
                <div class="select">
 
                    ${h.select('default_fork','',c.fork_choices)}
 
                </div>
 
             </div>
 
            <div class="buttons">
 
              ${h.submit('save',_('Save'),class_="ui-btn large")}
 
              ${h.reset('reset',_('Reset'),class_="ui-btn large")}
 
            </div>
 
        </div>
 
    </div>
 
    ${h.end_form()}
 
</div>
 

			




	
	
	
		
 
<div style="min-height:780px" class="box box-right">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        <h5>${_('Default User Permissions')}</h5>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## permissions overview

			




	
	
	
		
 
    <div id="perms" class="table">

			




	
	
	
		
 
           %for section in sorted(c.perm_user.permissions.keys()):

			




	
	
	
		
 
              <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>

			




	
	
	
		
 
              %if not c.perm_user.permissions[section]:

			




	
	
	
		
 
                  <span class="empty_data">${_('Nothing here yet')}</span>

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
              <div id='tbl_list_wrap_${section}' class="yui-skin-sam">

			




	
	
	
		
 
               <table id="tbl_list_${section}">

			




	
	
	
		
 
                <thead>

			




	
	
	
		
 
                    <tr>

			




	
	
	
		
 
                    <th class="left">${_('Name')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Permission')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Edit Permission')}</th>

			




	
	
	
		
 
                </thead>

			




	
	
	
		
 
                <tbody>

			




	
	
	
		
 
                %for k in c.perm_user.permissions[section]:

			




	
	
	
		
 
                %for k in sorted(c.perm_user.permissions[section], key=lambda s: s.lower):

			




	
	
	
		
 
                     <%

			




	
	
	
		
 
                     if section != 'global':

			




	
	
	
		
 
                         section_perm = c.perm_user.permissions[section].get(k)

			




	
	
	
		
 
                         _perm = section_perm.split('.')[-1]

			




	
	
	
		
 
                     else:

			




	
	
	
		
 
                         _perm = section_perm = None

			




	
	
	
		
 
                     %>

			




	
	
	
		
 
                    <tr>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            %if section == 'repositories':

			




	
	
	
		
 
                                <a href="${h.url('summary_home',repo_name=k)}">${k}</a>

			




	
	
	
		
 
                            %elif section == 'repositories_groups':

			




	
	
	
		
 
                                <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.get_permission_name(k)}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            %if section == 'global':

			




	
	
	
		
 
                             ${h.bool2icon(k.split('.')[-1] != 'none')}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             <span class="perm_tag ${_perm}">${section_perm}</span>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            %if section == 'repositories':

			




	
	
	
		
 
                                <a href="${h.url('edit_repo',repo_name=k,anchor='permissions_manage')}">${_('edit')}</a>

			




	
	
	
		
 
                            %elif section == 'repositories_groups':

			




	
	
	
		
 
                                <a href="${h.url('edit_repos_group',group_name=k,anchor='permissions_manage')}">${_('edit')}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                --

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
               </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
           %endfor

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<div class="box box-left" style="clear:left">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        <h5>${_('Allowed IP addresses')}</h5>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/users/user_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -160,97 +160,97 @@

			




	
	
	
		
 
                <div class="checkboxes">

			




	
	
	
		
 
                    ${h.checkbox('inherit_default_permissions',value=True)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span class="help-block">${h.literal(_('Select to inherit permissions from %s settings. '

			




	
	
	
		
 
                                             'With this selected below options does not have any action') % h.link_to('default', url('edit_permission', id='default')))}</span>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             <div id="inherit_overlay" style="${'opacity:0.3' if c.user.inherit_default_permissions else ''}" >

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label label-checkbox">

			




	
	
	
		
 
                    <label for="create_repo_perm">${_('Create repositories')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="checkboxes">

			




	
	
	
		
 
                    ${h.checkbox('create_repo_perm',value=True)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label label-checkbox">

			




	
	
	
		
 
                    <label for="fork_repo_perm">${_('Fork repositories')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="checkboxes">

			




	
	
	
		
 
                    ${h.checkbox('fork_repo_perm',value=True)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
              ${h.submit('save',_('Save'),class_="ui-btn large")}

			




	
	
	
		
 
              ${h.reset('reset',_('Reset'),class_="ui-btn large")}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## permissions overview

			




	
	
	
		
 
    <div id="perms" class="table">

			




	
	
	
		
 
           %for section in sorted(c.perm_user.permissions.keys()):

			




	
	
	
		
 
              <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>

			




	
	
	
		
 
              %if not c.perm_user.permissions[section]:

			




	
	
	
		
 
                  <span class="empty_data">${_('Nothing here yet')}</span>

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
              <div id='tbl_list_wrap_${section}' class="yui-skin-sam">

			




	
	
	
		
 
               <table id="tbl_list_${section}">

			




	
	
	
		
 
                <thead>

			




	
	
	
		
 
                    <tr>

			




	
	
	
		
 
                    <th class="left">${_('Name')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Permission')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Edit Permission')}</th>

			




	
	
	
		
 
                </thead>

			




	
	
	
		
 
                <tbody>

			




	
	
	
		
 
                %for k in c.perm_user.permissions[section]:

			




	
	
	
		
 
                %for k in sorted(c.perm_user.permissions[section], key=lambda s: s.lower):

			




	
	
	
		
 
                     <%

			




	
	
	
		
 
                     if section != 'global':

			




	
	
	
		
 
                         section_perm = c.perm_user.permissions[section].get(k)

			




	
	
	
		
 
                         _perm = section_perm.split('.')[-1]

			




	
	
	
		
 
                     else:

			




	
	
	
		
 
                         _perm = section_perm = None

			




	
	
	
		
 
                     %>

			




	
	
	
		
 
                    <tr>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            %if section == 'repositories':

			




	
	
	
		
 
                                <a href="${h.url('summary_home',repo_name=k)}">${k}</a>

			




	
	
	
		
 
                            %elif section == 'repositories_groups':

			




	
	
	
		
 
                                <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.get_permission_name(k)}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            %if section == 'global':

			




	
	
	
		
 
                             ${h.bool2icon(k.split('.')[-1] != 'none')}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             <span class="perm_tag ${_perm}">${section_perm}</span>

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            %if section == 'repositories':

			




	
	
	
		
 
                                <a href="${h.url('edit_repo',repo_name=k,anchor='permissions_manage')}">${_('edit')}</a>

			




	
	
	
		
 
                            %elif section == 'repositories_groups':

			




	
	
	
		
 
                                <a href="${h.url('edit_repos_group',group_name=k,anchor='permissions_manage')}">${_('edit')}</a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                --

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </tbody>

			




	
	
	
		
 
               </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
           %endfor

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<div class="box box-left" style="clear:left">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        <h5>${_('Email addresses')}</h5>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/users/user_edit_my_account.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,97 +11,97 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box box-left">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    ${c.form|n}

			




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

			




	
	
	
		
 
        </h5>

			




	
	
	
		
 
         <ul class="links" style="color:#DADADA">

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="show_perms" class="link-white current" href="#perms">${_('My permissions')}</a> </span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="show_my" class="link-white" href="#my">${_('My repos')}</a> </span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="show_pullrequests" class="link-white" href="#pullrequests">${_('My pull requests')}</a> </span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
         </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div id="perms_container">

			




	
	
	
		
 
        <div id="perms" class="table">

			




	
	
	
		
 
           %for section in sorted(c.rhodecode_user.permissions.keys()):

			




	
	
	
		
 
            <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div id='tbl_list_wrap_${section}' class="yui-skin-sam">

			




	
	
	
		
 
            <table id="tbl_list_${section}">

			




	
	
	
		
 
              <thead>

			




	
	
	
		
 
                  <tr>

			




	
	
	
		
 
                  <th class="left">${_('Name')}</th>

			




	
	
	
		
 
                  <th class="left">${_('Permission')}</th>

			




	
	
	
		
 
              </thead>

			




	
	
	
		
 
              <tbody>

			




	
	
	
		
 
            %for k in c.rhodecode_user.permissions[section]:

			




	
	
	
		
 
            %for k in sorted(c.rhodecode_user.permissions[section], key=lambda s: s.lower):

			




	
	
	
		
 
           <%

			




	
	
	
		
 
           if section != 'global':

			




	
	
	
		
 
               section_perm = c.rhodecode_user.permissions[section].get(k)

			




	
	
	
		
 
               _perm = section_perm.split('.')[-1]

			




	
	
	
		
 
           else:

			




	
	
	
		
 
               _perm = section_perm = None

			




	
	
	
		
 
           %>

			




	
	
	
		
 
            %if _perm not in ['none']:

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        %if section == 'repositories':

			




	
	
	
		
 
                            <a href="${h.url('summary_home',repo_name=k)}">${k}</a>

			




	
	
	
		
 
                        %elif section == 'repositories_groups':

			




	
	
	
		
 
                            <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                            ${k}

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        %if section == 'global':

			




	
	
	
		
 
                         ${h.bool2icon(True)}

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                        <span class="perm_tag ${_perm}">${section_perm}</span>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                     </td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </tbody>

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
           %endfor

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <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...')}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
pyroutes.register('admin_settings_my_pullrequests', "${url('admin_settings_my_pullrequests')}", []);

			




	
	
	
		
 

			




	
	
	
		
 
var show_perms = function(e){

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/users_groups/users_group_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -141,88 +141,88 @@ ${h.end_form()}

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box box-right">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        <h5>${_('Group members')}</h5>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="group_members_wrap">

			




	
	
	
		
 
    % if c.group_members_obj:

			




	
	
	
		
 
      <ul class="group_members">

			




	
	
	
		
 
      %for user in c.group_members_obj:

			




	
	
	
		
 
        <li>

			




	
	
	
		
 
          <div class="group_member">

			




	
	
	
		
 
            <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div>

			




	
	
	
		
 
            <div>${h.link_to(user.username, h.url('edit_user',id=user.user_id))}</div>

			




	
	
	
		
 
            <div>${user.full_name}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
      %endfor

			




	
	
	
		
 
      </ul>

			




	
	
	
		
 
      %else:

			




	
	
	
		
 
        <span class="empty_data">${_('No members yet')}</span>

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div class="box box-left">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        <h5>${_('Permissions defined for this group')}</h5>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
 ## permissions overview

			




	
	
	
		
 
    <div id="perms" class="table">

			




	
	
	
		
 
       %for section in sorted(c.users_group.permissions.keys()):

			




	
	
	
		
 
          <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>

			




	
	
	
		
 
          %if not c.users_group.permissions:

			




	
	
	
		
 
              <span class="empty_data">${_('No permissions set yet')}</span>

			




	
	
	
		
 
          %else:

			




	
	
	
		
 
          <div id='tbl_list_wrap_${section}' class="yui-skin-sam">

			




	
	
	
		
 
           <table id="tbl_list_repository">

			




	
	
	
		
 
            <thead>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                <th class="left">${_('Name')}</th>

			




	
	
	
		
 
                <th class="left">${_('Permission')}</th>

			




	
	
	
		
 
                <th class="left">${_('Edit Permission')}</th>

			




	
	
	
		
 
            </thead>

			




	
	
	
		
 
            <tbody>

			




	
	
	
		
 
            %for k in c.users_group.permissions[section]:

			




	
	
	
		
 
            %for k in sorted(c.users_group.permissions[section], key=lambda s: s.lower):

			




	
	
	
		
 
                 <%

			




	
	
	
		
 
                     section_perm = c.users_group.permissions[section].get(k)

			




	
	
	
		
 
                     _perm = section_perm.split('.')[-1]

			




	
	
	
		
 
                 %>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        %if section == 'repositories':

			




	
	
	
		
 
                            <a href="${h.url('summary_home',repo_name=k)}">${k}</a>

			




	
	
	
		
 
                        %elif section == 'repositories_groups':

			




	
	
	
		
 
                            <a href="${h.url('repos_group_home',group_name=k)}">${k}</a>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                         <span class="perm_tag ${_perm}">${section_perm}</span>

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        %if section == 'repositories':

			




	
	
	
		
 
                            <a href="${h.url('edit_repo',repo_name=k,anchor='permissions_manage')}">${_('edit')}</a>

			




	
	
	
		
 
                        %elif section == 'repositories_groups':

			




	
	
	
		
 
                            <a href="${h.url('edit_repos_group',group_name=k,anchor='permissions_manage')}">${_('edit')}</a>

			




	
	
	
		
 
                        %else:

			




	
	
	
		
 
                            --

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </tbody>

			




	
	
	
		
 
           </table>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
       %endfor

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
  MultiSelectWidget('users_group_members','available_members','edit_users_group');

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.