Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Géocontrib Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GéoContrib
Géocontrib Frontend
Commits
220b313f
Commit
220b313f
authored
3 years ago
by
Timothee P
Browse files
Options
Downloads
Patches
Plain Diff
fix first page number not displayed if only 3 pages
parent
f0fbfbab
No related branches found
No related tags found
2 merge requests
!295
Version 3.0.0
,
!232
REDMINE_ISSUE-11834
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/feature/FeatureListTable.vue
+6
-9
6 additions, 9 deletions
src/components/feature/FeatureListTable.vue
with
6 additions
and
9 deletions
src/components/feature/FeatureListTable.vue
+
6
−
9
View file @
220b313f
...
@@ -296,16 +296,18 @@ export default {
...
@@ -296,16 +296,18 @@ export default {
},
},
displayedPageNumbers
()
{
displayedPageNumbers
()
{
//* s'il y a moins de 5 pages, renvoyer toutes les pages
if
(
this
.
lastPageNumber
<
5
)
return
this
.
pageNumbers
//* si la page courante est inférieur à 5, la liste commence à l'index 0 et on retourne 5 pages
//* si la page courante est inférieur à 5, la liste commence à l'index 0 et on retourne 5 pages
let
firstPageInList
=
0
;
let
firstPageInList
=
0
;
let
pagesQuantity
=
5
;
let
pagesQuantity
=
5
;
//* à partir de la 5ième page et jusqu'à la 4ième page avant la fin : n'afficher que 3 page entre les ellipses et la page courante doit être au milieu
//* à partir de la 5ième page et jusqu'à la 4ième page avant la fin : n'afficher que 3 page entre les ellipses et la page courante doit être au milieu
if
(
this
.
pagination
.
currentPage
>=
5
&&
!
(
this
.
lastPageNumber
-
this
.
pagination
.
currentPage
<
4
))
{
if
(
this
.
pagination
.
currentPage
>=
5
&&
!
(
(
this
.
lastPageNumber
-
this
.
pagination
.
currentPage
)
<
4
))
{
firstPageInList
=
this
.
pagination
.
currentPage
-
2
;
firstPageInList
=
this
.
pagination
.
currentPage
-
2
;
pagesQuantity
=
3
pagesQuantity
=
3
}
}
//*
a
partir de 4 résultat avant la fin afficher seulement les 5 derniers résultats
//*
à
partir de 4 résultat avant la fin afficher seulement les 5 derniers résultats
if
(
this
.
lastPageNumber
-
this
.
pagination
.
currentPage
<
4
)
{
if
(
(
this
.
lastPageNumber
-
this
.
pagination
.
currentPage
)
<
4
)
{
firstPageInList
=
this
.
lastPageNumber
-
5
;
firstPageInList
=
this
.
lastPageNumber
-
5
;
}
}
return
this
.
pageNumbers
.
slice
(
firstPageInList
,
firstPageInList
+
pagesQuantity
);
return
this
.
pageNumbers
.
slice
(
firstPageInList
,
firstPageInList
+
pagesQuantity
);
...
@@ -324,7 +326,6 @@ export default {
...
@@ -324,7 +326,6 @@ export default {
},
},
isEditDisabled
(
feature
)
{
isEditDisabled
(
feature
)
{
//console.log("feature", feature)
const
userStatus
=
this
.
USER_LEVEL_PROJECTS
[
this
.
project
.
slug
];
const
userStatus
=
this
.
USER_LEVEL_PROJECTS
[
this
.
project
.
slug
];
const
access
=
{
const
access
=
{
"
Administrateur projet
"
:
[
"
draft
"
,
"
published
"
,
"
archived
"
],
"
Administrateur projet
"
:
[
"
draft
"
,
"
published
"
,
"
archived
"
],
...
@@ -333,13 +334,9 @@ export default {
...
@@ -333,13 +334,9 @@ export default {
"
Contributeur
"
:
[
"
draft
"
,
this
.
project
.
moderation
?
"
pending
"
:
"
published
"
],
"
Contributeur
"
:
[
"
draft
"
,
this
.
project
.
moderation
?
"
pending
"
:
"
published
"
],
};
};
console
.
log
(
"
userStatus
"
,
userStatus
)
if
(
userStatus
===
"
Super Contributeur
"
||
userStatus
===
"
Contributeur
"
)
{
if
(
userStatus
===
"
Super Contributeur
"
||
userStatus
===
"
Contributeur
"
)
{
console
.
log
(
"
feature.properties.creator.username
"
,
feature
.
properties
.
creator
.
username
)
console
.
log
(
"
this.user.username
"
,
this
.
user
.
username
)
if
(
feature
.
properties
.
creator
.
username
!==
this
.
user
.
username
)
return
true
;
if
(
feature
.
properties
.
creator
.
username
!==
this
.
user
.
username
)
return
true
;
}
}
//console.log("access[userStatus].includes(feature.properties.status.value)", access[userStatus].includes(feature.properties.status.value))
return
!
access
[
userStatus
].
includes
(
feature
.
properties
.
status
.
value
);
return
!
access
[
userStatus
].
includes
(
feature
.
properties
.
status
.
value
);
},
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment