kallithea Changeset - 32cb8d45f330

Changeset - 32cb8d45f330

Parent rev.

Child rev.

[Not reviewed]

beta

0 7 0

Mads Kiilerich - 13 years ago 2013-03-28 01:10:45
madski@unity3d.com

helpers: show boolean value of value as icon, not just the True and False singletons

7 files changed with 13 insertions and 16 deletions:

rhodecode/controllers/admin/users.py

rhodecode/lib/helpers.py

rhodecode/templates/admin/permissions/permissions.html

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/admin/users/user_edit.html

rhodecode/templates/admin/users/user_edit_my_account.html

rhodecode/templates/admin/users_groups/users_groups.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users.py

➞

Show inline comments

@@ @@ -96,15 +96,15 @@ class UsersController(BaseController): @@
                 "raw_username": user.username,
                 "username": user_lnk(user.user_id, user.username),
                 "firstname": user.name,
                 "lastname": user.lastname,
                 "last_login": h.fmt_date(user.last_login),
                 "last_login_raw": datetime_to_time(user.last_login),
                 "active": h.bool2icon(user.active),
                 "admin": h.bool2icon(user.admin),
                 "ldap": h.bool2icon(bool(user.ldap_dn)),
                 "active": h.boolicon(user.active),
                 "admin": h.boolicon(user.admin),
                 "ldap": h.boolicon(bool(user.ldap_dn)),
                 "action": user_actions(user.user_id, user.username),
             })
         c.data = json.dumps({
             "totalRecords": total_records,
             "startIndex": 0,

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -491,29 +491,26 @@ def desc_stylize(value): @@
     value = re.sub(r'\[([a-z]+)\]',
                   '<div class="metatag" tag="\\1">\\1</div>', value)
     return value
 def bool2icon(value):
     """Returns True/False values represented as small html image of true/false
 def boolicon(value):
     """Returns boolean value of a value, represented as small html image of true/false
     icons
-    :param value: bool value
     :param value: value
     """
-    if value is True:
     if value:
         return HTML.tag('img', src=url("/images/icons/accept.png"),
                         alt=_('True'))
     if value is False:
     else:
         return HTML.tag('img', src=url("/images/icons/cancel.png"),
                         alt=_('False'))
     return value
 def action_parser(user_log, feed=False, parse_cs=False):
     """
     This helper will action_map the specified string action into translated
     fancy names with icons and links

rhodecode/templates/admin/permissions/permissions.html

➞

Show inline comments

@@ @@ -136,13 +136,13 @@ @@
                             %else:
                                 ${h.get_permission_name(k)}
                             %endif
                         </td>
                         <td>
                             %if section == 'global':
-                             ${h.bool2icon(k.split('.')[-1] != 'none')}
+                             ${h.boolicon(k.split('.')[-1] != 'none')}
                             %else:
                              <span class="perm_tag ${_perm}">${section_perm}</span>
                             %endif
                         </td>
                         <td>
                             %if section == 'repositories':

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -218,13 +218,13 @@ ${self.context_bar('options')} @@
                 <th>${_('Active')}</th>
                 </tr>
               %for cache in c.repo_info.cache_keys:
                   <tr>
                     <td>${cache.get_prefix() or '-'}</td>
                     <td>${cache.cache_key}</td>
-                    <td>${h.bool2icon(cache.cache_active)}</td>
+                    <td>${h.boolicon(cache.cache_active)}</td>
                   </tr>
               %endfor
               </table>
           </div>
        </div>
     </div>

rhodecode/templates/admin/users/user_edit.html

➞

Show inline comments

@@ @@ -222,13 +222,13 @@ @@
                             %else:
                                 ${h.get_permission_name(k)}
                             %endif
                         </td>
                         <td>
                             %if section == 'global':
-                             ${h.bool2icon(k.split('.')[-1] != 'none')}
+                             ${h.boolicon(k.split('.')[-1] != 'none')}
                             %else:
                              <span class="perm_tag ${_perm}">${section_perm}</span>
                             %endif
                         </td>
                         <td>
                             %if section == 'repositories':

rhodecode/templates/admin/users/user_edit_my_account.html

➞

Show inline comments

@@ @@ -74,13 +74,13 @@ @@
                         %else:
                             ${k}
                         %endif
                     </td>
                     <td>
                         %if section == 'global':
-                         ${h.bool2icon(True)}
+                         ${h.boolicon(True)}
                         %else:
                         <span class="perm_tag ${_perm}">${section_perm}</span>
                         %endif
                      </td>
                 </tr>
              %endif

rhodecode/templates/admin/users_groups/users_groups.html

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ @@
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,u_group in enumerate(c.users_groups_list):
                 <tr class="parity${cnt%2}">
                     <td>${h.link_to(u_group.users_group_name,h.url('edit_users_group', id=u_group.users_group_id))}</td>
                     <td><span class="tooltip" title="${h.tooltip(', '.join(map(h.safe_unicode,[x.user.username for x in u_group.members[:50]])))}">${len(u_group.members)}</span></td>
-                    <td>${h.bool2icon(u_group.users_group_active)}</td>
+                    <td>${h.boolicon(u_group.users_group_active)}</td>
                     <td>
                         ${h.form(url('users_group', id=u_group.users_group_id),method='delete')}
                             ${h.submit('remove_',_('delete'),id="remove_group_%s" % u_group.users_group_id,
                             class_="delete_icon action_button",onclick="return  confirm('"+_('Confirm to delete this user group: %s') % u_group.users_group_name+"');")}
                         ${h.end_form()}
                     </td>

0 comments (0 inline, 0 general)