diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-03-13 06:52:15 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-03-13 06:52:15 +0200 |
| commit | 2070e056f8e3d0c3bd41968309f0d44002788f36 (patch) | |
| tree | bc6f3fa4c884379c8aa75c1e5b18d6f7942ee0d5 | |
| parent | 5c81f3f2463f85031d3d166995a92390298aba56 (diff) | |
linkify perms and make global ones display better
--HG--
branch : beta
| -rw-r--r-- | rhodecode/public/js/rhodecode.js | 5 | ||||
| -rw-r--r-- | rhodecode/templates/admin/users/user_edit_my_account.html | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/rhodecode/public/js/rhodecode.js b/rhodecode/public/js/rhodecode.js index 47e85ae8..4c8c03c8 100644 --- a/rhodecode/public/js/rhodecode.js +++ b/rhodecode/public/js/rhodecode.js @@ -704,8 +704,9 @@ var permNameSort = function(a, b, desc, field) { 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); diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html index f3a74260..3f7b4e00 100644 --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -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 |