Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
c9a0d157
Verified
Commit
c9a0d157
authored
Apr 11, 2020
by
Florent Chehab
Browse files
fixed(front - version): force order and cleaned ordering
parent
d9bb08e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
backend/backend_app/models/version.py
View file @
c9a0d157
...
...
@@ -90,4 +90,4 @@ class VersionViewSet(BaseModelViewSet):
ct
=
ContentType
.
objects
.
get_for_id
(
content_type_id
)
model
=
ct
.
model_class
()
obj
=
model
.
objects
.
get
(
pk
=
object_pk
)
return
Version
.
objects
.
get_for_object
(
obj
)
return
Version
.
objects
.
get_for_object
(
obj
)
.
order_by
(
'revision_id'
)
frontend/src/components/edition/History.jsx
View file @
c9a0d157
...
...
@@ -31,12 +31,7 @@ const useStyles = makeStyles(theme => ({
}
}));
function
VersionInfo
({
rawModelData
,
versionNumber
,
totalNbVersions
,
editFromVersion
})
{
function
VersionInfo
({
rawModelData
,
versionNumber
,
editFromVersion
})
{
const
classes
=
useStyles
();
let
dateInfo
=
<
em
>
(Information non connue.)
</
em
>;
...
...
@@ -52,7 +47,7 @@ function VersionInfo({
(dans de tels cas, seul la dernière est conservée).
</
Typography
>
<
Typography
variant
=
"h6"
align
=
"center"
>
{
`Version n°
${
totalNbVersions
-
versionNumber
}
du
${
dateInfo
}
`
}
{
`Version n°
${
versionNumber
+
1
}
du
${
dateInfo
}
`
}
</
Typography
>
<
Button
variant
=
"outlined"
...
...
@@ -68,7 +63,6 @@ function VersionInfo({
VersionInfo
.
propTypes
=
{
rawModelData
:
PropTypes
.
object
.
isRequired
,
totalNbVersions
:
PropTypes
.
number
.
isRequired
,
versionNumber
:
PropTypes
.
number
.
isRequired
,
editFromVersion
:
PropTypes
.
func
.
isRequired
};
...
...
@@ -98,7 +92,9 @@ function History({
api
.
versions
.
setParams
(
buildParams
(
modelInfo
));
},
[
modelInfo
]);
const
[
currentVersion
,
goNextVersion
,
goPreviousVersion
]
=
useStepper
(
1
);
const
[
currentVersion
,
goNextVersion
,
goPreviousVersion
]
=
useStepper
(
versions
.
length
-
1
);
const
maxSteps
=
versions
.
length
;
...
...
@@ -145,7 +141,6 @@ function History({
<
VersionInfo
rawModelData
=
{
newRawModelData
}
versionNumber
=
{
currentVersion
}
totalNbVersions
=
{
versions
.
length
}
editFromVersion
=
{
editFromVersion
}
/>
<
br
/>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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