haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 01:20:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #800 from haiwen/active-users

Browse Source 
show active users count at sys info page
This commit is contained in:
Daniel Pan
2015-09-09 11:04:46 +08:00
parent b75d4ef5cc fdbe188f48
commit 9c542cba3e
2 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
seahub/templates/sysadmin/sys_info.html
View File

@@ -15,12 +15,27 @@
<a href="http://manual{% if LANGUAGE_CODE == 'zh-cn' %}-cn{% endif %}.seafile.com/deploy_pro/migrate_from_seafile_community_server.html" target="_blank">{% trans "Upgrade to Pro Edition" %}</a>
{% endif %}
</dd>
<dt>{% trans "Libraries" %}</dt>
<dd>{{repos_count}}</dd>
<dt>{% trans "Users" %}</dt>
<dd>{{users_count}} {% if license_dict %}/ {{license_dict.MaxUsers}}{% endif %}</dd>
{% if is_pro %}
<dt>{% trans "Active Users" %} / {% trans "Total Users" %} / {% trans "Limits" %}</dt>
<dd>
{% if active_users_count %}{{ active_users_count }}{% else %}--{% endif %}
/
{% if users_count %}{{ users_count }}{% else %}--{% endif %}
/
{% if license_dict %}{{ license_dict.MaxUsers }}{% else %}--{% endif %}
</dd>
{% else %}
<dt>{% trans "Active Users" %} / {% trans "Total Users" %}</dt>
<dd>
{% if active_users_count %}{{ active_users_count }}{% else %}--{% endif %}
/
{% if users_count %}{{ users_count }}{% else %}--{% endif %}
</dd>
{% endif %}
<dt>{% trans "Groups" %}</dt>
<dd>{{groups_count}}</dd>

43
seahub/views/sysadmin.py
View File

@@ -62,20 +62,18 @@ def sys_info(request):
Arguments:
- `request`:
"""
try:
users_count = ccnet_threaded_rpc.count_emailusers('DB') + ccnet_threaded_rpc.count_emailusers('LDAP')
except Exception as e:
logger.error(e)
users_count = 0
# count repos
repos_count = mute_seafile_api.count_repos()
# count groups
try:
groups_count = len(ccnet_threaded_rpc.get_all_groups(-1, -1))
except Exception as e:
logger.error(e)
groups_count = 0
# count orgs
if MULTI_TENANCY:
try:
org_count = ccnet_threaded_rpc.count_orgs()
@@ -85,14 +83,47 @@ def sys_info(request):
else:
org_count = -1
# count users
try:
active_db_users = ccnet_threaded_rpc.count_emailusers('DB')
except Exception as e:
logger.error(e)
active_db_users = 0
try:
active_ldap_users = ccnet_threaded_rpc.count_emailusers('LDAP')
except Exception as e:
logger.error(e)
active_ldap_users = 0
try:
inactive_db_users = ccnet_threaded_rpc.count_inactive_emailusers('DB')
except Exception as e:
logger.error(e)
inactive_db_users = 0
try:
inactive_ldap_users = ccnet_threaded_rpc.count_inactive_emailusers('LDAP')
except Exception as e:
logger.error(e)
inactive_ldap_users = 0
active_users = active_db_users + active_ldap_users if active_ldap_users > 0 \
else active_db_users
inactive_users = inactive_db_users + inactive_ldap_users if inactive_ldap_users > 0 \
else inactive_db_users
is_pro = is_pro_version()
if is_pro:
license_file = os.path.join(settings.PROJECT_ROOT, '../../seafile-license.txt')
license_dict = parse_license(license_file)
else:
license_dict = {}
return render_to_response('sysadmin/sys_info.html', {
'users_count': users_count,
'users_count': active_users + inactive_users,
'active_users_count': active_users,
'repos_count': repos_count,
'groups_count': groups_count,
'org_count': org_count,