Added two state simple template and updated user list view to use it
This commit is contained in:
@@ -105,14 +105,18 @@ def pretty_size_10(size):
|
||||
|
||||
def exists_with_famfam(path):
|
||||
try:
|
||||
if os.path.exists(path):
|
||||
return u'<span class="famfam active famfam-tick"></span>'
|
||||
else:
|
||||
return u'<span class="famfam active famfam-cross"></span>'
|
||||
return two_state_template(os.path.exists(path))
|
||||
except Exception, exc:
|
||||
return exc
|
||||
|
||||
|
||||
def two_state_template(state, famfam_ok_icon=u'tick', famfam_fail_icon=u'cross'):
|
||||
if state:
|
||||
return u'<span class="famfam active famfam-%s"></span>' % famfam_ok_icon
|
||||
else:
|
||||
return u'<span class="famfam active famfam-%s"></span>' % famfam_fail_icon
|
||||
|
||||
|
||||
# The code here is based loosely on John Cardinal's notes found at:
|
||||
# http://www.johncardinal.com/tmgutil/capitalizenames.htm
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ from django.contrib.contenttypes.models import ContentType
|
||||
|
||||
from permissions.api import check_permissions
|
||||
from common.forms import ChoiceForm
|
||||
from common.utils import generate_choices_w_labels
|
||||
from common.utils import generate_choices_w_labels, two_state_template
|
||||
|
||||
from user_management import PERMISSION_USER_VIEW, \
|
||||
PERMISSION_USER_EDIT, PERMISSION_USER_CREATE, \
|
||||
@@ -40,7 +40,7 @@ def user_list(request):
|
||||
'attribute': 'email'
|
||||
}, {
|
||||
'name': _(u'active'),
|
||||
'attribute': 'is_active'
|
||||
'attribute': lambda x: two_state_template(x.is_active),
|
||||
}
|
||||
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user