Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mario Chirinos Colunga
GeoInt_SIDT
Commits
ac0a5e60
Commit
ac0a5e60
authored
Feb 21, 2019
by
Ulises Morales Ramírez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
panel de administracion
parent
9582b653
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
83 deletions
+72
-83
aside.html
administration/templates/aside.html
+32
-0
dashboard.html
administration/templates/dashboard.html
+1
-59
users_table.html
administration/templates/users_table.html
+3
-15
urls.py
administration/urls.py
+3
-1
views.py
administration/views.py
+32
-7
views.py
catalog/views.py
+1
-1
No files found.
administration/templates/aside.html
0 → 100644
View file @
ac0a5e60
<div
class=
"form-group"
>
<br>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<li>
<a
class=
"treeview "
href=
"{{ BASE_URL }}/catalog"
>
<i
class=
"fa fa-map"
></i>
<span>
Home
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview "
href=
"../../administration/request"
>
<i
class=
"fa fa-user-plus"
></i>
<span>
Request
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
<li>
<a
class=
"treeview "
href=
"../../administration/users"
>
<i
class=
"fa fa-users"
></i>
<span>
Active users
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
</ul>
</div>
\ No newline at end of file
administration/templates/dashboard.html
View file @
ac0a5e60
...
@@ -106,21 +106,7 @@
...
@@ -106,21 +106,7 @@
{% endblock %}
{% endblock %}
{% block sidebar %}
{% block sidebar %}
<div
class=
"form-group"
>
{% include 'aside.html' %}
<br>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<li>
<a
class=
"treeview "
href=
"{{ BASE_URL }}/catalog"
>
<i
class=
"fa fa-map"
></i>
<span>
Home
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
</ul>
</div>
<!-- form-group-->
{% endblock %}
{% endblock %}
{% block user %}
{% block user %}
...
@@ -135,51 +121,7 @@
...
@@ -135,51 +121,7 @@
<div
class=
"panel panel-default"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
{{ Viewname }}
</div>
<div
class=
"panel-heading"
>
{{ Viewname }}
</div>
<div
class=
"panel-body text-center"
>
<div
class=
"panel-body text-center"
>
<table
data-toggle=
"table"
id=
"example"
class=
"table table-striped table-bordered"
style=
"width:100%"
>
<thead>
<th>
Username
</th>
<th>
First Name
</th>
<th>
Last Name
</th>
<th>
E-mail
</th>
<th>
Active
</th>
<th>
Staff
</th>
<th>
Super
</th>
<th>
Actions
</th>
</thead>
<tbody>
{% for user in users %}
<tr>
<td>
{{ user.username }}
</td>
<td>
{{ user.first_name }}
</td>
<td>
{{ user.last_name }}
</td>
<td>
{{ user.email }}
</td>
<form
method=
"post"
action=
"update/"
>
{% csrf_token %}
<input
type=
"hidden"
name=
"user_id"
value=
"{{ user.user_id }}"
>
<td>
<input
type=
"checkbox"
name=
"is_active"
value=
"1"
{%
if
user
.
status =
=
True
%}
checked
{%
endif
%}
>
</td>
<td>
<input
type=
"checkbox"
name=
"is_staff"
value=
"1"
{%
if
user
.
staff =
=
True
%}
checked
{%
endif
%}
>
</td>
<td>
<input
type=
"checkbox"
name=
"is_superuser"
value=
"1"
{%
if
user
.
superuser =
=
True
%}
checked
{%
endif
%}
>
</td>
<td>
<button
type=
"submit"
class=
"btn btn-success"
><i
class=
"fa fa-save"
></i></button>
<a
href=
"#"
class=
"btn btn-danger"
><i
class=
"fa fa-trash"
></i></a>
</td>
</form>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
</section>
</section>
...
...
administration/templates/users_table.html
View file @
ac0a5e60
...
@@ -106,20 +106,7 @@
...
@@ -106,20 +106,7 @@
{% endblock %}
{% endblock %}
{% block sidebar %}
{% block sidebar %}
<div
class=
"form-group"
>
{% include 'aside.html' %}
<br>
<ul
class=
"sidebar-menu"
data-widget=
"tree"
>
<li>
<a
class=
"treeview "
href=
"{{ BASE_URL }}/catalog"
>
<i
class=
"fa fa-map"
></i>
<span>
Home
</span>
<span
class=
"pull-right-container"
>
<span
class=
"label label-primary pull-right"
></span>
</span>
</a>
</li>
</ul>
</div>
<!-- form-group-->
<!-- form-group-->
{% endblock %}
{% endblock %}
...
@@ -154,9 +141,10 @@
...
@@ -154,9 +141,10 @@
<td>
{{ user.first_name }}
</td>
<td>
{{ user.first_name }}
</td>
<td>
{{ user.last_name }}
</td>
<td>
{{ user.last_name }}
</td>
<td>
{{ user.email }}
</td>
<td>
{{ user.email }}
</td>
<form
method=
"post"
action=
"update/"
>
<form
method=
"post"
action=
"
../
update/"
>
{% csrf_token %}
{% csrf_token %}
<input
type=
"hidden"
name=
"request_path"
value=
"{{ request.path }}"
>
<input
type=
"hidden"
name=
"user_id"
value=
"{{ user.user_id }}"
>
<input
type=
"hidden"
name=
"user_id"
value=
"{{ user.user_id }}"
>
<td>
<td>
<input
type=
"checkbox"
name=
"is_active"
value=
"1"
<input
type=
"checkbox"
name=
"is_active"
value=
"1"
...
...
administration/urls.py
View file @
ac0a5e60
...
@@ -3,6 +3,8 @@ from django.conf.urls import url
...
@@ -3,6 +3,8 @@ from django.conf.urls import url
from
.
import
views
from
.
import
views
urlpatterns
=
[
urlpatterns
=
[
url
(
r'^$'
,
views
.
Request_users
,
name
=
'Dashboard'
),
url
(
r'^$'
,
views
.
Dashboard
,
name
=
'Dashboard'
),
url
(
r'^request/$'
,
views
.
Request_users
,
name
=
'Request'
),
url
(
r'^update/$'
,
views
.
update_user
,
name
=
'update'
),
url
(
r'^update/$'
,
views
.
update_user
,
name
=
'update'
),
url
(
r'^users/$'
,
views
.
active_users
,
name
=
'users'
),
]
]
\ No newline at end of file
administration/views.py
View file @
ac0a5e60
...
@@ -2,11 +2,17 @@ from django.contrib import messages
...
@@ -2,11 +2,17 @@ from django.contrib import messages
from
django.contrib.auth.models
import
User
from
django.contrib.auth.models
import
User
from
django.shortcuts
import
render
,
redirect
from
django.shortcuts
import
render
,
redirect
import
json
import
json
from
django.http
import
HttpResponse
,
HttpResponseRedirect
from
django.http
import
HttpResponse
,
HttpResponseRedirect
,
HttpRequest
from
PIL
import
Image
from
PIL
import
Image
# Create your views here.
# Create your views here.
def
Request_users
(
request
):
def
Dashboard
(
request
):
return
render
(
request
,
'dashboard.html'
,
{
"Viewname"
:
"Dashboard"
})
# ----------------------------------------------------------
def
Request_users
(
request
):
if
request
.
user
.
is_superuser
or
request
.
user
.
is_staff
:
if
request
.
user
.
is_superuser
or
request
.
user
.
is_staff
:
user_list
=
[]
user_list
=
[]
for
user
in
User
.
objects
.
filter
(
is_active
=
False
):
for
user
in
User
.
objects
.
filter
(
is_active
=
False
):
...
@@ -20,11 +26,13 @@ def Request_users (request):
...
@@ -20,11 +26,13 @@ def Request_users (request):
"staff"
:
user
.
is_staff
,
"staff"
:
user
.
is_staff
,
"superuser"
:
user
.
is_superuser
,
"superuser"
:
user
.
is_superuser
,
})
})
#messages.success(request, 'your registration is being processed')
#
messages.success(request, 'your registration is being processed')
return
render
(
request
,
'users_table.html'
,{
'users'
:
user_list
,
"Viewname"
:
"Request"
})
return
render
(
request
,
'users_table.html'
,
{
'users'
:
user_list
,
"Viewname"
:
"Request"
})
else
:
else
:
return
redirect
(
'../'
)
return
redirect
(
'../'
)
#------------------------------------------------------------------------
# ------------------------------------------------------------------------
def
update_user
(
request
):
def
update_user
(
request
):
is_active
=
False
is_active
=
False
is_staff
=
False
is_staff
=
False
...
@@ -44,6 +52,23 @@ def update_user(request):
...
@@ -44,6 +52,23 @@ def update_user(request):
user
.
save
()
user
.
save
()
messages
.
success
(
request
,
'the user was updated'
)
messages
.
success
(
request
,
'the user was updated'
)
return
HttpResponseRedirect
(
'../'
)
return
redirect
(
request
.
POST
.
get
(
'request_path'
))
def
active_users
(
request
):
def
active_users
(
request
):
pass
if
request
.
user
.
is_superuser
or
request
.
user
.
is_staff
:
\ No newline at end of file
user_list
=
[]
for
user
in
User
.
objects
.
filter
(
is_active
=
True
):
user_list
.
append
({
"user_id"
:
user
.
id
,
"username"
:
user
.
username
,
"first_name"
:
user
.
first_name
,
"last_name"
:
user
.
last_name
,
"email"
:
user
.
email
,
"status"
:
user
.
is_active
,
"staff"
:
user
.
is_staff
,
"superuser"
:
user
.
is_superuser
,
})
# messages.success(request, 'your registration is being processed')
return
render
(
request
,
'users_table.html'
,
{
'users'
:
user_list
,
"Viewname"
:
"Request"
})
catalog/views.py
View file @
ac0a5e60
...
@@ -646,7 +646,7 @@ def IPN(request):
...
@@ -646,7 +646,7 @@ def IPN(request):
# pass
# pass
# else:
# else:
# pass
# pass
# return redirect("https://google.com.mx")
# return redirect("https://google.com.mx")
# ------------------------------------------------------
# ------------------------------------------------------
def
Registration
(
request
):
def
Registration
(
request
):
#user = User.objects.filter(email=request.POST['email'])
#user = User.objects.filter(email=request.POST['email'])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment