Skip to content
Snippets Groups Projects
Commit f8c6943e authored by Timothee P's avatar Timothee P :sunflower:
Browse files

refactor display messages in feature type edit

parent d025615a
No related branches found
No related tags found
1 merge request!475REDMINE_ISSUE-14383| Permettre la visualisation, l'import et l'export de géométries-multiples
......@@ -66,7 +66,7 @@ export function transformProperties(prop) {
const regInteger = /^-*?\d+$/;
const regFloat = /^-*?\d*?\.\d+$/;
const regText = /[\r\n]/;
if (type === 'boolean' || prop.toLowerCase() === 'true' || prop.toLowerCase() === 'False') {
if (type === 'boolean' || (type === 'string' && (prop.toLowerCase() === 'true' || prop.toLowerCase() === 'False'))) {
return 'boolean';
} else if (regInteger.test(prop) || Number.isSafeInteger(prop)) {
return 'integer';
......
<template>
<div id="feature-type-edit">
<div
id="message"
class="fullwidth"
>
<div
v-if="error"
class="ui negative message"
>
<p>
<i
class="cross icon"
aria-hidden="true"
/>
{{ error }}
</p>
</div>
</div>
<div class="fourteen wide column">
<div
:class="{ active: loading }"
......@@ -185,12 +168,14 @@ export default {
loading: false,
action: 'create',
dataKey: 0,
error: null,
csvFields: null,
geomTypeChoices: [
{ value: 'linestring', name: 'Ligne' },
{ value: 'point', name: 'Point' },
{ value: 'polygon', name: 'Polygone' },
{ value: 'multilinestring', name: 'Multiligne' },
{ value: 'multipoint', name: 'Multipoint' },
{ value: 'multipolygon', name: 'Multipolygone' },
],
form: {
colors_style: {
......@@ -395,6 +380,9 @@ export default {
},
methods: {
...mapMutations([
'DISPLAY_MESSAGES',
]),
...mapMutations('feature-type', [
'ADD_CUSTOM_FORM',
'EMPTY_FORM',
......@@ -540,9 +528,10 @@ export default {
} else if (status === 201) {
this.goBackToProject('Le nouveau type de signalement a été créé');
} else {
this.displayMessage(
"Une erreur est survenue lors de l'import du type de signalement"
);
this.DISPLAY_MESSAGES({
comment: "Une erreur est survenue lors de l'import du type de signalement",
level: 'negative'
});
}
});
}
......@@ -558,10 +547,10 @@ export default {
if (response && response.status === 200) {
this.goBackToProject();
} else {
this.displayMessage(
"Une erreur est survenue lors de l'import de signalements.\n " +
response.data.detail
);
this.DISPLAY_MESSAGES({
comment: `Une erreur est survenue lors de l'import de signalements.\n ${ response.data.detail }`,
level: 'negative'
});
}
this.loading = false;
})
......@@ -616,13 +605,6 @@ export default {
}
},
displayMessage(message) {
this.error = message;
document
.getElementById('message')
.scrollIntoView({ block: 'end', inline: 'nearest' });
},
// ****** Methodes for geojson import ****** //
toNewFeatureType() {
this.$router.push({
......
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