Skip to content

Commit eb30f37

Browse files
usmannasirusmannasir
committed
LIST USERS should also be available from the /users/ page.
1 parent afdbc36 commit eb30f37

File tree

2 files changed

+85
-63
lines changed

2 files changed

+85
-63
lines changed

‎userManagment/templates/userManagment/index.html‎

Lines changed: 79 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,79 +3,96 @@
33
{% block title %}{% trans "User Functions - CyberPanel" %}{% endblock %}
44
{% block content %}
55

6-
{% load static %}
7-
{% get_current_language as LANGUAGE_CODE %}
8-
<!-- Current language: {{ LANGUAGE_CODE }} -->
6+
{% load static %}
7+
{% get_current_language as LANGUAGE_CODE %}
8+
<!-- Current language: {{ LANGUAGE_CODE }} -->
99

1010

11-
<div class="container">
12-
<div id="page-title">
13-
<h2>{% trans "User Functions" %}</h2>
14-
<p>{% trans "Create, edit and delete users on this page." %}</p>
15-
</div>
16-
<div class="panel col-md-11">
17-
<div class="panel-body">
18-
<h3 class="content-box-header">
19-
{% trans "Available Functions" %}
20-
</h3>
21-
<div class="example-box-wrapper">
22-
<div class="row">
23-
<div class="col-md-3 btn-min-width">
24-
<a href="{% url 'viewProfile' %}" title="{% trans 'View Profile' %}" class="tile-box tile-box-shortcut btn-primary">
25-
<div class="tile-header">
26-
{% trans "View Profile" %}
27-
</div>
28-
<div class="tile-content-wrapper">
29-
<i class="fa fa-id-card"></i>
30-
</div>
31-
</a>
32-
</div>
33-
{% if type != 3 %}
34-
<div class="col-md-3 btn-min-width">
35-
<a href="{% url 'createUser' %}" title="{% trans 'Create User' %}" class="tile-box tile-box-shortcut btn-primary">
36-
<div class="tile-header">
37-
{% trans "Create User" %}
38-
</div>
39-
<div class="tile-content-wrapper">
40-
<i class="fa fa-user"></i>
41-
</div>
42-
</a>
43-
</div>
11+
<div class="container">
12+
<div id="page-title">
13+
<h2>{% trans "User Functions" %}</h2>
14+
<p>{% trans "Create, edit and delete users on this page." %}</p>
15+
</div>
16+
<div class="panel col-md-11">
17+
<div class="panel-body">
18+
<h3 class="content-box-header">
19+
{% trans "Available Functions" %}
20+
</h3>
21+
<div class="example-box-wrapper">
22+
<div class="row">
23+
<div class="col-md-3 btn-min-width">
24+
<a href="{% url 'viewProfile' %}" title="{% trans 'View Profile' %}"
25+
class="tile-box tile-box-shortcut btn-primary">
26+
<div class="tile-header">
27+
{% trans "View Profile" %}
28+
</div>
29+
<div class="tile-content-wrapper">
30+
<i class="fa fa-id-card"></i>
31+
</div>
32+
</a>
33+
</div>
34+
{% if listUsers %}
35+
<div class="col-md-3 btn-min-width">
36+
<a href="{% url 'listUsers' %}" title="{% trans 'List Users' %}"
37+
class="tile-box tile-box-shortcut btn-primary">
38+
<div class="tile-header">
39+
{% trans "List Users" %}
40+
</div>
41+
<div class="tile-content-wrapper">
42+
<i class="fa fa-id-card"></i>
43+
</div>
44+
</a>
45+
</div>
46+
{% endif %}
47+
{% if type != 3 %}
48+
<div class="col-md-3 btn-min-width">
49+
<a href="{% url 'createUser' %}" title="{% trans 'Create User' %}"
50+
class="tile-box tile-box-shortcut btn-primary">
51+
<div class="tile-header">
52+
{% trans "Create User" %}
53+
</div>
54+
<div class="tile-content-wrapper">
55+
<i class="fa fa-user"></i>
56+
</div>
57+
</a>
58+
</div>
4459

45-
<div class="col-md-3 btn-min-width">
46-
<a href="{% url 'modifyUsers' %}" title="{% trans 'Modify User' %}" class="tile-box tile-box-shortcut btn-primary">
47-
<div class="tile-header">
48-
{% trans "Modify User" %}
49-
</div>
50-
<div class="tile-content-wrapper">
51-
<i class="fa fa-edit"></i>
52-
</div>
53-
</a>
54-
</div>
60+
<div class="col-md-3 btn-min-width">
61+
<a href="{% url 'modifyUsers' %}" title="{% trans 'Modify User' %}"
62+
class="tile-box tile-box-shortcut btn-primary">
63+
<div class="tile-header">
64+
{% trans "Modify User" %}
65+
</div>
66+
<div class="tile-content-wrapper">
67+
<i class="fa fa-edit"></i>
68+
</div>
69+
</a>
70+
</div>
5571

56-
{% endif %}
72+
{% endif %}
5773

5874

59-
{% if type != 3 %}
75+
{% if type != 3 %}
6076

61-
<div class="col-md-3 btn-min-width">
62-
<a href="{% url 'deleteUser' %}" title="{% trans 'Delete User' %}" class="tile-box tile-box-shortcut btn-primary">
63-
<div class="tile-header">
64-
{% trans "Delete User" %}
65-
</div>
66-
<div class="tile-content-wrapper">
67-
<i class="fa fa-trash"></i>
68-
</div>
69-
</a>
70-
</div>
77+
<div class="col-md-3 btn-min-width">
78+
<a href="{% url 'deleteUser' %}" title="{% trans 'Delete User' %}"
79+
class="tile-box tile-box-shortcut btn-primary">
80+
<div class="tile-header">
81+
{% trans "Delete User" %}
82+
</div>
83+
<div class="tile-content-wrapper">
84+
<i class="fa fa-trash"></i>
85+
</div>
86+
</a>
87+
</div>
7188

72-
{% endif %}
89+
{% endif %}
7390

74-
</div>
91+
</div>
92+
</div>
93+
</div>
7594
</div>
7695
</div>
77-
</div>
78-
</div>
7996

8097

8198
{% endblock %}

‎userManagment/views.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ def loadUserHome(request):
1818
val = request.session['userID']
1919
try:
2020
admin = Administrator.objects.get(pk=val)
21-
return render(request, 'userManagment/index.html', {"type": admin.type})
21+
currentACL = ACLManager.loadedACL(val)
22+
if currentACL['admin'] == 1:
23+
listUsers = 1
24+
else:
25+
listUsers = currentACL['listUsers']
26+
return render(request, 'userManagment/index.html', {"type": admin.type, 'listUsers': listUsers})
2227
except BaseException, msg:
2328
logging.CyberCPLogFileWriter.writeToFile(str(msg))
2429
return HttpResponse(str(msg))

0 commit comments

Comments
 (0)