Skip to content
Snippets Groups Projects
Commit 80a87269 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issues/12026' into 'develop'

REDMINE_ISSUE-12026

See merge request !119
parents ffbb73e0 700e35cc
No related branches found
No related tags found
No related merge requests found
......@@ -72,7 +72,7 @@
<!-- Import GeoImage -->
<div v-frag v-if="feature_type && feature_type.geom_type === 'point'">
<p v-if="isOffline()!=true">
<p v-if="isOffline() != true">
<button
@click="toggleGeoRefModal"
id="add-geo-image"
......@@ -122,9 +122,11 @@
class="image_file"
id="image_file"
/>
<p class="error-message">
{{ erreurUploadMessage }}
</p>
<ul v-if="erreurUploadMessage" class="errorlist">
<li>
{{ erreurUploadMessage }}
</li>
</ul>
</div>
<button
@click="georeferencement"
......@@ -207,9 +209,9 @@
</div>
<!-- Pièces jointes -->
<div v-if="isOffline()!=true">
<div v-if="isOffline() != true">
<div class="ui horizontal divider">PIÈCES JOINTES</div>
<div v-if="isOffline()!=true" id="formsets-attachment">
<div v-if="isOffline() != true" id="formsets-attachment">
<FeatureAttachmentForm
v-for="form in attachmentFormset"
:key="form.dataKey"
......@@ -229,7 +231,7 @@
</div>
<!-- Signalements liés -->
<div v-if="isOffline()!=true">
<div v-if="isOffline() != true">
<div class="ui horizontal divider">SIGNALEMENTS LIÉS</div>
<div id="formsets-link">
<FeatureLinkedForm
......@@ -356,7 +358,7 @@ export default {
"features",
"extra_form",
"linked_features",
"statusChoices"
"statusChoices",
]),
field_title() {
......@@ -443,8 +445,8 @@ export default {
},
methods: {
isOffline(){
return navigator.onLine==false;
isOffline() {
return navigator.onLine == false;
},
initForm() {
if (this.currentRouteName === "editer-signalement") {
......@@ -544,9 +546,15 @@ export default {
});
}
})
.catch((response) => {
console.log("FAILURE!!");
this.erreurUploadMessage = response.data.message;
.catch((error) => {
console.log({ error });
if (error && error.response && error.response) {
this.erreurUploadMessage = error.response.data.error;
} else {
this.erreurUploadMessage =
"Une erreur est survenue pendant l'import de l'image géoréférencée";
}
});
},
......@@ -1033,9 +1041,6 @@ export default {
margin: 1rem 0 !important;
}
.error-message {
color: red;
}
/* override to display buttons under the dimmer of modal */
.leaflet-top,
.leaflet-bottom {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment