Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
3bdd17a0
Commit
3bdd17a0
authored
Jul 04, 2016
by
chirac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reassigne des ips au désarchivage
parent
36f95c88
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
6 deletions
+22
-6
machines/views.py
machines/views.py
+14
-5
users/views.py
users/views.py
+8
-1
No files found.
machines/views.py
View file @
3bdd17a0
...
...
@@ -11,14 +11,19 @@ from .models import NewMachineForm, EditMachineForm, EditInterfaceForm, AddInter
from
.models
import
Machine
,
Interface
,
IpList
from
users.models
import
User
def
unassign_ip
(
machine
):
machine
.
ipv4
=
None
machine
.
save
()
def
unassign_ips
(
user
):
machines
=
Interface
.
objects
.
filter
(
machine
=
Machine
.
objects
.
filter
(
user
=
user
))
for
machine
in
machines
:
unassign_ip
(
machine
)
unassign_ipv4
(
machine
)
return
def
assign_ips
(
user
):
""" Assign une ipv4 aux machines d'un user """
machines
=
Interface
.
objects
.
filter
(
machine
=
Machine
.
objects
.
filter
(
user
=
user
))
for
machine
in
machines
:
if
not
machine
.
ipv4
:
interface
=
assign_ipv4
(
machine
)
interface
.
save
()
return
def
free_ip
():
...
...
@@ -32,6 +37,10 @@ def assign_ipv4(interface):
interface
.
ipv4
=
free_ips
[
0
]
return
interface
def
unassign_ipv4
(
interface
):
interface
.
ipv4
=
None
interface
.
save
()
def
form
(
ctx
,
template
,
request
):
c
=
ctx
c
.
update
(
csrf
(
request
))
...
...
users/views.py
View file @
3bdd17a0
...
...
@@ -15,7 +15,7 @@ from machines.models import Machine, Interface
from
users.forms
import
PassForm
from
search.models
import
SearchForm
from
cotisations.views
import
is_adherent
,
end_adhesion
from
machines.views
import
unassign_ips
from
machines.views
import
unassign_ips
,
assign_ips
from
re2o.login
import
makeSecret
,
hashNT
...
...
@@ -24,6 +24,11 @@ def archive(user):
unassign_ips
(
user
)
return
def
unarchive
(
user
):
""" Triger actions au desarchivage d'un user """
assign_ips
(
user
)
return
def
end_ban
(
user
):
""" Renvoie la date de fin de ban d'un user, False sinon """
date_max
=
Ban
.
objects
.
all
().
filter
(
user
=
user
).
aggregate
(
Max
(
'date_end'
))[
'date_end__max'
]
...
...
@@ -83,6 +88,8 @@ def state(request, userid):
if
state
.
has_changed
():
if
state
.
cleaned_data
[
'state'
]
==
User
.
STATE_ARCHIVED
:
archive
(
user
)
else
:
unarchive
(
user
)
state
.
save
()
messages
.
success
(
request
,
"Etat changé avec succès"
)
return
redirect
(
"/users/"
)
...
...
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