Mercurial > kallithea

changeset 2128:e29c688e6885 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
linkify perms and make global ones display better
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 13 Mar 2012 06:52:15 +0200
parents b745d5d2563c
children 43481c3d70ca
files rhodecode/public/js/rhodecode.js rhodecode/templates/admin/users/user_edit_my_account.html
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/js/rhodecode.js	Tue Mar 13 06:36:53 2012 +0200
+++ b/rhodecode/public/js/rhodecode.js	Tue Mar 13 06:52:15 2012 +0200
@@ -704,8 +704,9 @@
     var a_ = fromHTML(a.getData(field));
     var b_ = fromHTML(b.getData(field));
     // extract name from table
-    a_ = a_.innerHTML;
-    b_ = b_.innerHTML;      
+
+    a_ = a_.children[0].innerHTML;
+    b_ = b_.children[0].innerHTML;      
     
     var comp = YAHOO.util.Sort.compare;
     var compState = comp(a_, b_, desc);
--- a/rhodecode/templates/admin/users/user_edit_my_account.html	Tue Mar 13 06:36:53 2012 +0200
+++ b/rhodecode/templates/admin/users/user_edit_my_account.html	Tue Mar 13 06:52:15 2012 +0200
@@ -186,10 +186,18 @@
               <tbody>
             %for k in c.rhodecode_user.permissions[section]:
                 <tr>
-                    <td>${k}</td>
+                    <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':
-                         ${', '.join(c.rhodecode_user.permissions[section])}
+                         ${h.bool2icon(True)}
                         %else:
                         <span class="perm_tag ${c.rhodecode_user.permissions[section].get(k).split('.')[-1] }">${c.rhodecode_user.permissions[section].get(k)}</span>
                         %endif