Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nounous
re2o
Commits
bdd6d29f
Commit
bdd6d29f
authored
Dec 11, 2016
by
root
Browse files
Fix pour reversion 2
parent
a3d8b88a
Changes
4
Hide whitespace changes
Inline
Side-by-side
cotisations/views.py
View file @
bdd6d29f
...
...
@@ -13,6 +13,7 @@ from django.db import transaction
from
django.forms
import
modelformset_factory
,
formset_factory
import
os
from
reversion
import
revisions
as
reversion
from
reversion.models
import
Version
from
.models
import
Facture
,
Article
,
Vente
,
Cotisation
,
Paiement
,
Banque
from
.forms
import
NewFactureForm
,
TrezEditFactureForm
,
EditFactureForm
,
ArticleForm
,
DelArticleForm
,
PaiementForm
,
DelPaiementForm
,
BanqueForm
,
DelBanqueForm
,
NewFactureFormPdf
,
SelectArticleForm
...
...
@@ -399,7 +400,7 @@ def history(request, object, id):
else
:
messages
.
error
(
request
,
"Objet inconnu"
)
return
redirect
(
"/cotisations/"
)
reversions
=
rev
ersion
.
get_for_object
(
object_instance
)
reversions
=
V
ersion
.
objects
.
get_for_object
(
object_instance
)
paginator
=
Paginator
(
reversions
,
PAGINATION_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
...
...
machines/views.py
View file @
bdd6d29f
...
...
@@ -18,7 +18,7 @@ from django.views.decorators.csrf import csrf_exempt
from
rest_framework.renderers
import
JSONRenderer
from
machines.serializers
import
InterfaceSerializer
,
TypeSerializer
,
AliasSerializer
,
MxSerializer
,
ExtensionSerializer
,
NsSerializer
from
reversion
import
revisions
as
reversion
from
reversion.models
import
Version
import
re
from
.forms
import
NewMachineForm
,
EditMachineForm
,
EditInterfaceForm
,
AddInterfaceForm
,
MachineTypeForm
,
DelMachineTypeForm
,
ExtensionForm
,
DelExtensionForm
,
BaseEditInterfaceForm
,
BaseEditMachineForm
...
...
@@ -645,7 +645,7 @@ def history(request, object, id):
else
:
messages
.
error
(
request
,
"Objet inconnu"
)
return
redirect
(
"/machines/"
)
reversions
=
rev
ersion
.
get_for_object
(
object_instance
)
reversions
=
V
ersion
.
objects
.
get_for_object
(
object_instance
)
paginator
=
Paginator
(
reversions
,
PAGINATION_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
...
...
topologie/views.py
View file @
bdd6d29f
...
...
@@ -5,6 +5,7 @@ from django.db import IntegrityError
from
django.db
import
transaction
from
django.core.paginator
import
Paginator
,
EmptyPage
,
PageNotAnInteger
from
reversion
import
revisions
as
reversion
from
reversion.models
import
Version
from
topologie.models
import
Switch
,
Port
,
Room
from
topologie.forms
import
EditPortForm
,
NewSwitchForm
,
EditSwitchForm
,
AddPortForm
,
EditRoomForm
...
...
@@ -46,7 +47,7 @@ def history(request, object, id):
else
:
messages
.
error
(
request
,
"Objet inconnu"
)
return
redirect
(
"/topologie/"
)
reversions
=
rev
ersion
.
get_for_object
(
object_instance
)
reversions
=
V
ersion
.
objects
.
get_for_object
(
object_instance
)
paginator
=
Paginator
(
reversions
,
PAGINATION_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
...
...
users/views.py
View file @
bdd6d29f
...
...
@@ -14,6 +14,7 @@ from django.utils import timezone
from
django.core.urlresolvers
import
reverse
from
django.db
import
transaction
from
reversion.models
import
Version
from
reversion
import
revisions
as
reversion
from
users.models
import
User
,
Right
,
Ban
,
Whitelist
,
School
,
ListRight
,
Request
from
users.models
import
DelRightForm
,
BanForm
,
WhitelistForm
,
DelSchoolForm
,
DelListRightForm
,
NewListRightForm
...
...
@@ -545,7 +546,7 @@ def history(request, object, id):
else
:
messages
.
error
(
request
,
"Objet inconnu"
)
return
redirect
(
"/users/"
)
reversions
=
rev
ersion
.
get_for_object
(
object_instance
)
reversions
=
V
ersion
.
objects
.
get_for_object
(
object_instance
)
paginator
=
Paginator
(
reversions
,
PAGINATION_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
...
...
Write
Preview
Supports
Markdown
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