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
dde4d6a1
Commit
dde4d6a1
authored
Jul 02, 2016
by
chirac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ajoute une table ban
parent
f502e593
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
2 deletions
+48
-2
users/admin.py
users/admin.py
+5
-1
users/migrations/0006_ban.py
users/migrations/0006_ban.py
+25
-0
users/migrations/__pycache__/0006_ban.cpython-34.pyc
users/migrations/__pycache__/0006_ban.cpython-34.pyc
+0
-0
users/models.py
users/models.py
+18
-1
No files found.
users/admin.py
View file @
dde4d6a1
from
django.contrib
import
admin
from
.models
import
User
,
School
,
Right
,
ListRight
from
.models
import
User
,
School
,
Right
,
ListRight
,
Ban
class
UserAdmin
(
admin
.
ModelAdmin
):
list_display
=
(
'name'
,
'surname'
,
'pseudo'
,
'email'
,
'school'
,
'state'
)
...
...
@@ -14,7 +14,11 @@ class ListRightAdmin(admin.ModelAdmin):
class
RightAdmin
(
admin
.
ModelAdmin
):
list_display
=
(
'user'
,
'right'
)
class
BanAdmin
(
admin
.
ModelAdmin
):
list_display
=
(
'user'
,
'raison'
,
'date_start'
,
'date_end'
)
admin
.
site
.
register
(
User
,
UserAdmin
)
admin
.
site
.
register
(
School
,
SchoolAdmin
)
admin
.
site
.
register
(
Right
,
RightAdmin
)
admin
.
site
.
register
(
ListRight
,
ListRightAdmin
)
admin
.
site
.
register
(
Ban
,
BanAdmin
)
users/migrations/0006_ban.py
0 → 100644
View file @
dde4d6a1
# -*- coding: utf-8 -*-
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'users'
,
'0005_auto_20160702_0006'
),
]
operations
=
[
migrations
.
CreateModel
(
name
=
'Ban'
,
fields
=
[
(
'id'
,
models
.
AutoField
(
serialize
=
False
,
auto_created
=
True
,
verbose_name
=
'ID'
,
primary_key
=
True
)),
(
'raison'
,
models
.
CharField
(
max_length
=
255
)),
(
'date_start'
,
models
.
DateTimeField
(
help_text
=
'%m/%d/%y %H:%M:%S'
)),
(
'date_end'
,
models
.
DateTimeField
(
help_text
=
'%m/%d/%y %H:%M:%S'
)),
(
'user'
,
models
.
ForeignKey
(
on_delete
=
django
.
db
.
models
.
deletion
.
PROTECT
,
to
=
'users.User'
)),
],
),
]
users/migrations/__pycache__/0006_ban.cpython-34.pyc
0 → 100644
View file @
dde4d6a1
File added
users/models.py
View file @
dde4d6a1
...
...
@@ -20,7 +20,6 @@ class User(models.Model):
promo
=
models
.
CharField
(
max_length
=
255
)
pwd_ssha
=
models
.
CharField
(
max_length
=
255
)
pwd_ntlm
=
models
.
CharField
(
max_length
=
255
)
#location = models.ForeignKey('Location', on_delete=models.SET_DEFAULT)
state
=
models
.
IntegerField
(
choices
=
STATES
,
default
=
STATE_ACTIVE
)
def
__str__
(
self
):
...
...
@@ -48,6 +47,15 @@ class ListRight(models.Model):
def
__str__
(
self
):
return
self
.
listright
class
Ban
(
models
.
Model
):
user
=
models
.
ForeignKey
(
'User'
,
on_delete
=
models
.
PROTECT
)
raison
=
models
.
CharField
(
max_length
=
255
)
date_start
=
models
.
DateTimeField
(
help_text
=
'%m/%d/%y %H:%M:%S'
)
date_end
=
models
.
DateTimeField
(
help_text
=
'%m/%d/%y %H:%M:%S'
)
def
__str__
(
self
):
return
str
(
self
.
user
)
+
' '
+
str
(
self
.
raison
)
class
UserForm
(
ModelForm
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
(
InfoForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
...
...
@@ -102,3 +110,12 @@ class DelRightForm(ModelForm):
model
=
Right
exclude
=
[
'user'
,
'right'
]
class
BanForm
(
ModelForm
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
(
BanForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
self
.
fields
[
'date_start'
].
label
=
'Date de début'
self
.
fields
[
'date_end'
].
label
=
'Date de fin'
class
Meta
:
model
=
Ban
exclude
=
[
'user'
]
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