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
externe Matthieu
Géocontrib Frontend
Commits
5086fd2f
Commit
5086fd2f
authored
2 years ago
by
Timothee P
Browse files
Options
Downloads
Patches
Plain Diff
prevent leaving the page without saving modification
parent
7763f2c0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Feature/Detail/FeatureHeader.vue
+1
-6
1 addition, 6 deletions
src/components/Feature/Detail/FeatureHeader.vue
src/views/Feature/FeatureDetail.vue
+36
-11
36 additions, 11 deletions
src/views/Feature/FeatureDetail.vue
with
37 additions
and
17 deletions
src/components/Feature/Detail/FeatureHeader.vue
+
1
−
6
View file @
5086fd2f
...
...
@@ -78,7 +78,7 @@
:class=
"['ui button button-hover-orange tiny-margin',
{ disabled: false }]"
data-tooltip="Enregistrer les modifications"
data-position="bottom center"
@click="
saveFastEdition
"
@click="
$store.dispatch('feature/SEND_FEATURE', $route.name)
"
>
<i
class=
"save fitted icon"
...
...
@@ -252,11 +252,6 @@ export default {
});
},
saveFastEdition
()
{
this
.
$store
.
dispatch
(
'
feature/SEND_FEATURE
'
,
this
.
$route
.
name
)
.
then
(()
=>
console
.
log
(
'
sent
'
));
},
updateTitle
(
e
)
{
this
.
$store
.
commit
(
'
feature/UPDATE_FORM_FIELD
'
,
{
name
:
'
title
'
,
value
:
e
.
target
.
value
});
},
...
...
This diff is collapsed.
Click to expand it.
src/views/Feature/FeatureDetail.vue
+
36
−
11
View file @
5086fd2f
...
...
@@ -135,16 +135,20 @@ export default {
next
();
// continue page loading
},
beforeRouteUpdate
(
to
,
from
,
next
)
{
let
leaving
=
true
;
// by default navigate to next route
if
(
this
.
hasUnsavedChange
)
{
leaving
=
this
.
confirmLeave
();
// prompt user that there is unsaved changes or that features order might change
}
next
(
leaving
);
},
beforeRouteLeave
(
to
,
from
,
next
)
{
if
(
// In case of filtered listed featuers, if the user wants to edit a feature,
from
.
query
.
offset
>=
0
&&
to
.
name
===
'
editer-signalement
'
&&
!
this
.
confirmLeave
()
// warn the user that features order might change
){
next
(
false
);
}
else
{
// Navigate to next view
next
();
let
leaving
=
true
;
// by default navigate to next route
if
(
this
.
hasUnsavedChange
||
(
from
.
query
.
offset
>=
0
&&
to
.
name
===
'
editer-signalement
'
))
{
leaving
=
this
.
confirmLeave
();
// prompt user that there is unsaved changes or that features order might change
}
next
(
leaving
);
},
data
()
{
...
...
@@ -182,7 +186,19 @@ export default {
]),
...
mapState
(
'
feature
'
,
[
'
currentFeature
'
,
'
form
'
,
]),
hasUnsavedChange
()
{
if
(
this
.
form
.
title
!==
this
.
currentFeature
.
title
)
return
true
;
if
(
this
.
form
.
description
.
value
!==
this
.
currentFeature
.
description
)
return
true
;
if
(
this
.
form
.
status
.
value
!==
this
.
currentFeature
.
status
)
return
true
;
for
(
const
xForm
of
this
.
$store
.
state
.
feature
.
extra_forms
)
{
const
originalField
=
this
.
currentFeature
.
feature_data
.
find
(
el
=>
el
.
label
===
xForm
.
label
);
if
(
originalField
&&
xForm
.
value
!==
originalField
.
value
)
return
true
;
}
return
false
;
}
},
watch
:
{
...
...
@@ -266,16 +282,25 @@ export default {
},
confirmLeave
()
{
return
window
.
confirm
(
'
Vous allez quittez la vue signalement filtré, l
\'
ordre des signalements pourrait changer après édition d
\'
un signalement.
'
);
return
window
.
confirm
(
this
.
project
.
fast_edition_mode
&&
this
.
hasUnsavedChange
?
'
Les modifications apportées au signalement ne seront pas sauvegardées, continuer ?
'
:
'
Vous allez quittez la vue signalement filtré, l
\'
ordre des signalements pourrait changer après édition d
\'
un signalement.
'
);
},
async
pushNgo
(
newEntry
)
{
this
.
$router
.
push
(
newEntry
);
//* update the params or queries in the route/url
async
reloadPage
()
{
await
this
.
getPageInfo
();
mapService
.
removeFeatures
();
this
.
addFeatureToMap
();
},
pushNgo
(
newEntry
)
{
this
.
$router
.
push
(
newEntry
)
//* update the params or queries in the route/url
.
then
(()
=>
{
this
.
reloadPage
();
})
.
catch
(()
=>
true
);
//* catch error if navigation get aborted (in beforeRouteUpdate)
},
goBackToProject
(
message
)
{
this
.
$router
.
push
({
name
:
'
project_detail
'
,
...
...
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