fixed sort of permissions summary it's now perm+name

unified permissions summary for users and user groups

rhodecode/templates/base/perms_summary.html

@@ -0,0 +1,63 b''
+## snippet for displaying permissions overview for users
+
+<%def name="perms_summary(permissions)">
+<div id="perms" class="table">
+     %for section in sorted(permissions.keys()):
+        <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div>
+        %if not permissions[section]:
+            <span class="empty_data">${_('No permissions defined 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>
+          %if section == 'global':
+              %for k in sorted(permissions[section], key=lambda s: s.lower()):
+                  <tr>
+                      <td>
+                          ${h.get_permission_name(k)}
+                      </td>
+                      <td>
+                           ${h.boolicon(k.split('.')[-1] != 'none')}
+                      </td>
+                      <td>
+                           <a href="${h.url('edit_permission', id='default')}">${_('edit')}</a>
+                      </td>
+                  </tr>
+              %endfor
+          %else:
+              %for k, section_perm in sorted(permissions[section].items(), key=lambda s: s[1]+s[0].lower()):
+                  <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 ${section_perm.split('.')[-1]}">${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>
+                          %endif
+                      </td>
+                  </tr>
+              %endfor
+          %endif
+
+          </tbody>
+         </table>
+        </div>
+        %endif
+     %endfor
+</div>
+</%def>

rhodecode/templates/admin/permissions/permissions.html

@@ -1,215 +1,160 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Permissions administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Permissions')}
 </%def>
 
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 
 <%def name="main()">
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <h3>${_('Default permissions')}</h3>
     ${h.form(url('permission', id='default'),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="anonymous">${_('Anonymous access')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('anonymous',True)}
                     </div>
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="default_repo_perm">${_('Repository')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_repo_perm','',c.repo_perms_choices)}
 
                     ${h.checkbox('overwrite_default_repo','true')}
                     <label for="overwrite_default_repo">
                     <span class="tooltip"
                     title="${h.tooltip(_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost'))}">
                     ${_('Overwrite existing settings')}</span> </label>
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="default_group_perm">${_('Repository group')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_group_perm','',c.group_perms_choices)}
                     ${h.checkbox('overwrite_default_group','true')}
                     <label for="overwrite_default_group">
                     <span class="tooltip"
                     title="${h.tooltip(_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
                     ${_('Overwrite existing settings')}</span> </label>
 
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="default_register">${_('Registration')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_register','',c.register_choices)}
                 </div>
             </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 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.boolicon(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>
+    <%include file="/base/perms_summary.html"/>
+
 </div>
 <div class="box box-left" style="clear:left">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Allowed IP addresses')}</h5>
     </div>
 
     <div class="ips_wrap">
       <table class="noborder">
       %if c.user_ip_map:
         %for ip in c.user_ip_map:
           <tr>
               <td><div class="ip">${ip.ip_addr}</div></td>
               <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
               <td>
                 ${h.form(url('user_ips_delete', id=c.user.user_id),method='delete')}
                     ${h.hidden('del_ip',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
                     ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
               </td>
           </tr>
         %endfor
        %else:
         <tr><td><div class="ip">${_('All IP addresses are allowed')}</div></td></tr>
        %endif
       </table>
     </div>
 
     ${h.form(url('user_ips', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="new_ip">${_('New ip address')}:</label>
                 </div>
                 <div class="input">
                     ${h.hidden('default_user', 'True')}
                     ${h.text('new_ip', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="ui-btn large")}
               ${h.reset('reset',_('Reset'),class_="ui-btn large")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>

rhodecode/templates/admin/users/user_edit.html

@@ -1,343 +1,289 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Edit user')} ${c.user.username} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${_('Edit %s') % c.user.username}
 </%def>
 
 <%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 -->
     ${h.form(url('update_user', id=c.user.user_id),method='put')}
     <div class="form">
         <div class="field">
            <div class="gravatar_box">
                <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
                 <p>
                 %if c.use_gravatar:
                 <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                 <br/>${_('Using')} ${c.user.email}
                 %else:
                 <br/>${c.user.email}
                 %endif
            </div>
         </div>
         <div class="field">
             <div class="label">
                 <label>${_('API key')}:</label> ${c.user.api_key}
             </div>
         </div>
         ##show current ip just if we show ourself
         %if c.rhodecode_user.username == c.user.username:
         <div class="field">
             <div class="label">
                 <label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"}
             </div>
         </div>
         %endif
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     %if c.ldap_dn:
                         ${h.text('username',class_='medium disabled', readonly="readonly")}
                     %else:
                         ${h.text('username',class_='medium')}
                     %endif:
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="ldap_dn">${_('LDAP DN')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('ldap_dn',class_='medium disabled',readonly="readonly")}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="new_password">${_('New password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('new_password',class_='medium',autocomplete="off")}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="password_confirmation">${_('New password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',class_="medium",autocomplete="off")}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname',class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='medium')}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True)}
                 </div>
              </div>
 
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="admin">${_('Admin')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True)}
                 </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>${_('Permissions')}</h5>
     </div>
     ${h.form(url('user_perm', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="inherit_permissions">${_('Inherit default permissions')}:</label>
                 </div>
                 <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 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.boolicon(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>
+    <%namespace name="p" file="/base/perms_summary.html"/>
+    ${p.perms_summary(c.perm_user.permissions)}
+
 </div>
 <div class="box box-left" style="clear:left">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Email addresses')}</h5>
     </div>
 
     <div class="emails_wrap">
       <table class="noborder">
       %for em in c.user_email_map:
         <tr>
             <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(em.user.email,16)}"/> </div></td>
             <td><div class="email">${em.email}</div></td>
             <td>
               ${h.form(url('user_emails_delete', id=c.user.user_id),method='delete')}
                   ${h.hidden('del_email',em.email_id)}
                   ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id,
                   class_="delete_icon action_button", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
               ${h.end_form()}
             </td>
         </tr>
       %endfor
       </table>
     </div>
 
     ${h.form(url('user_emails', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="new_email">${_('New email address')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="ui-btn large")}
               ${h.reset('reset',_('Reset'),class_="ui-btn large")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-left" style="clear:left">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Allowed IP addresses')}</h5>
     </div>
 
     <div class="ips_wrap">
       <table class="noborder">
       %if c.user_ip_map:
         %for ip in c.user_ip_map:
           <tr>
               <td><div class="ip">${ip.ip_addr}</div></td>
               <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
               <td>
                 ${h.form(url('user_ips_delete', id=c.user.user_id),method='delete')}
                     ${h.hidden('del_ip',ip.ip_id)}
                     ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="delete_icon action_button", onclick="return  confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
               </td>
           </tr>
         %endfor
        %else:
         <tr><td><div class="ip">${_('All IP addresses are allowed')}</div></td></tr>
        %endif
       </table>
     </div>
 
     ${h.form(url('user_ips', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="new_ip">${_('New ip address')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_ip', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="ui-btn large")}
               ${h.reset('reset',_('Reset'),class_="ui-btn large")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>

rhodecode/templates/admin/users/user_edit_my_account.html

@@ -1,283 +1,239 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('My account')} ${c.rhodecode_user.username} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('My Account')}
 </%def>
 
 <%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" placeholder="${_('quick filter...')}" value="" 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>
+    ## permissions overview
+    <%namespace name="p" file="/base/perms_summary.html"/>
+    ${p.perms_summary(c.perm_user.permissions)}
 
-            <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 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.boolicon(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){
     YUD.addClass('show_perms', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_pullrequests','current');
 
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('perms_container','display','');
     YUD.setStyle('q_filter','display','none');
 }
 YUE.on('show_perms','click',function(e){
     show_perms();
 })
 
 var show_my = function(e){
     YUD.addClass('show_my', 'current');
     YUD.removeClass('show_perms','current');
     YUD.removeClass('show_pullrequests','current');
 
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','none');
     YUD.setStyle('my_container','display','');
     YUD.setStyle('q_filter','display','');
     if(!YUD.hasClass('show_my', 'loaded')){
         table_renderer(${c.data |n});
         YUD.addClass('show_my', 'loaded');
     }
 }
 YUE.on('show_my','click',function(e){
     show_my(e);
 })
 
 var show_pullrequests = function(e){
     YUD.addClass('show_pullrequests', 'current');
     YUD.removeClass('show_my','current');
     YUD.removeClass('show_perms','current');
 
     YUD.setStyle('my_container','display','none');
     YUD.setStyle('perms_container','display','none');
     YUD.setStyle('pullrequests_container','display','');
     YUD.setStyle('q_filter','display','none');
 
     var url = pyroutes.url('admin_settings_my_pullrequests');
     if(YUD.get('show_closed') && YUD.get('show_closed').checked) {
         var url = pyroutes.url('admin_settings_my_pullrequests', {'pr_show_closed': '1'});
     }
     ypjax(url, 'pullrequests_container', function(){
         YUE.on('show_closed','change',function (e) {
             show_pullrequests(e);
         });
     });
 }
 YUE.on('show_pullrequests','click',function(e){
     show_pullrequests(e)
 })
 
 var tabs = {
     'perms': show_perms,
     'my': show_my,
     'pullrequests': show_pullrequests
 }
 var url = location.href.split('#');
 if (url[1]) {
     //We have a hash
     var tabHash = url[1];
     var func = tabs[tabHash]
     if (func){
         func();
     }
 }
 
 function table_renderer(data){
     var myDataSource = new YAHOO.util.DataSource(data);
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
 
     myDataSource.responseSchema = {
         resultsList: "records",
         fields: [
             {key:"menu"},
             {key:"raw_name"},
             {key:"name"},
             {key:"last_changeset"},
             {key:"action"},
             ]
         };
     myDataSource.doBeforeCallback = function(req,raw,res,cb) {
         // This is the filter function
         var data     = res.results || [],
             filtered = [],
             i,l;
 
         if (req) {
             req = req.toLowerCase();
             for (i = 0; i<data.length; i++) {
                 var pos = data[i].raw_name.toLowerCase().indexOf(req)
                 if (pos != -1) {
                     filtered.push(data[i]);
                 }
             }
             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 }},
           {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({
             rowsPerPage: 50,
             alwaysVisible: false,
             template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}",
             pageLinks: 5,
             containerClass: 'pagination-wh',
             currentPageClass: 'pager_curpage',
             pageLinkClass: 'pager_link',
             nextPageLinkLabel: '&gt;',
             previousPageLinkLabel: '&lt;',
             firstPageLinkLabel: '&lt;&lt;',
             lastPageLinkLabel: '&gt;&gt;',
             containers:['user-paginator']
         }),
 
         MSG_SORTASC:"${_('Click to sort ascending')}",
         MSG_SORTDESC:"${_('Click to sort descending')}",
         MSG_EMPTY:"${_('No records found.')}",
         MSG_ERROR:"${_('Data error.')}",
         MSG_LOADING:"${_('Loading...')}",
       }
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
       });
 
       var filterTimeout = null;
 
       updateFilter = function() {
           // Reset timeout
           filterTimeout = null;
 
           // Reset sort
           var state = myDataTable.getState();
           state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
 
           // Get filtered data
           myDataSource.sendRequest(YUD.get('q_filter').value,{
               success : myDataTable.onDataReturnInitializeTable,
               failure : myDataTable.onDataReturnInitializeTable,
               scope   : myDataTable,
               argument: state
           });
 
       };
       YUE.on('q_filter','click',function(){
           if(!YUD.hasClass('q_filter', 'loaded')){
               //TODO: load here full list later to do search within groups
               YUD.addClass('q_filter', 'loaded');
           }
        });
 
       YUE.on('q_filter','keyup',function (e) {
           clearTimeout(filterTimeout);
           filterTimeout = setTimeout(updateFilter,600);
       });
 
     }
 </script>
 </%def>

rhodecode/templates/admin/users_groups/users_group_edit.html

@@ -1,228 +1,175 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Edit user group')} ${c.users_group.users_group_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('UserGroups'),h.url('users_groups'))}
     &raquo;
     ${_('Edit %s') % c.users_group.users_group_name}
 </%def>
 
 <%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 -->
     ${h.form(url('users_group', id=c.users_group.users_group_id),method='put', id='edit_users_group')}
     <div class="form">
         <!-- fields -->
             <div class="fields">
                  <div class="field">
                     <div class="label">
                         <label for="users_group_name">${_('Group name')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('users_group_name',class_='small')}
                     </div>
                  </div>
 
                  <div class="field">
                     <div class="label label-checkbox">
                         <label for="users_group_active">${_('Active')}:</label>
                     </div>
                     <div class="checkboxes">
                         ${h.checkbox('users_group_active',value=True)}
                     </div>
                  </div>
                 <div class="field">
                     <div class="label">
                         <label for="users_group_active">${_('Members')}:</label>
                     </div>
                     <div class="select">
                         <table>
                                 <tr>
                                     <td>
                                         <div>
                                             <div style="float:left">
                                                 <div class="text" style="padding: 0px 0px 6px;">${_('Chosen group members')}</div>
                                                 ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")}
                                                <div id="remove_all_elements" style="cursor:pointer;text-align:center">
                                                    ${_('Remove all elements')}
                                                    <img alt="remove" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_right.png')}"/>
                                                </div>
                                             </div>
                                             <div style="float:left;width:20px;padding-top:50px">
                                                 <img alt="add" id="add_element"
                                                     style="padding:2px;cursor:pointer"
                                                     src="${h.url('/images/icons/arrow_left.png')}"/>
                                                 <br />
                                                 <img alt="remove" id="remove_element"
                                                     style="padding:2px;cursor:pointer"
                                                     src="${h.url('/images/icons/arrow_right.png')}"/>
                                             </div>
                                             <div style="float:left">
                                                  <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>
                                                  ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")}
                                                  <div id="add_all_elements" style="cursor:pointer;text-align:center">
                                                        <img alt="add" style="vertical-align:text-bottom" src="${h.url('/images/icons/arrow_left.png')}"/>
                                                         ${_('Add all elements')}
                                                  </div>
                                             </div>
                                         </div>
                                     </td>
                                 </tr>
                         </table>
                     </div>
 
                 </div>
                 <div class="buttons">
                   ${h.submit('Save',_('Save'),class_="ui-btn large")}
                 </div>
             </div>
     </div>
 ${h.end_form()}
 </div>
 
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="inherit_permissions">${_('Inherit default permissions')}:</label>
                 </div>
                 <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.users_group.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
+    <%namespace name="p" file="/base/perms_summary.html"/>
+    ${p.perms_summary(c.users_group.permissions)}
 </div>
 
-<div class="box box-right">
+<div class="box box-right" style="clear: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 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>