+
-
-
-
-
Modification(s) de la règle {{ selected_rule }} ({{ Object.keys(selected_modification_list).length }})
-
-
-
-
Toutes les modifications ({{ Object.keys(modification_list).length }})
-
- - {{ modification.title }}
-
+
+
+
+
+
Modification(s) de la règle en cours de validation {{ selected_rule }} ({{ Object.keys(selected_modification_list).length }})
+
+
+
+
Toutes les modifications en cours de validation ({{ Object.keys(modification_list).length }})
+
+
+
+

+
@@ -54,6 +61,7 @@
selected_modification_list: {},
selected_rule: '',
test:0,
+ isLoading: true,
}
},
beforeMount: function() {
@@ -65,9 +73,11 @@
.get('/source/modified')
.then(response => {
this.modification_list = response.body;
+ this.isLoading = false;
return true;
}, response => {
if(response.status == 500) this.modification_list = {};
+ this.isLoading = false;
return false;
})
},
diff --git a/backoffice/src/components/Financements.vue b/backoffice/src/components/Financements.vue
index ab0102a18e95afded0b3f88d85ce0b21336234d7..38050598b96b40aba11deae8b6138be928f384c8 100644
--- a/backoffice/src/components/Financements.vue
+++ b/backoffice/src/components/Financements.vue
@@ -13,7 +13,7 @@
diff --git a/backoffice/src/components/Modification.vue b/backoffice/src/components/Modification.vue
index bde7c3fe671c830a3b00c5a85f5a2a943c93888b..be31d0add8e9d25f3e8fc5ad1dadcf127c269de7 100644
--- a/backoffice/src/components/Modification.vue
+++ b/backoffice/src/components/Modification.vue
@@ -53,7 +53,8 @@
'tag-file-renamed': '
RENOMMÉ',
'tag-file-added': '
AJOUTÉ',
'file-summary-wrapper': '
',
- 'generic-wrapper': '
{{{content}}}
'
+ 'generic-wrapper': '
{{{content}}}
',
+ 'file-summary-line':'
{{>fileIcon}}{{fileName}}{{addedLines}}{{deletedLines}}'
}
});
},
diff --git a/backoffice/src/components/Referentiel.vue b/backoffice/src/components/Referentiel.vue
index b57b561e7df799d80fce32af6c6803f839b7f6c8..688d79afdcf640cf51d529f3450bcbafab3bc2e5 100644
--- a/backoffice/src/components/Referentiel.vue
+++ b/backoffice/src/components/Referentiel.vue
@@ -78,14 +78,14 @@
},
printRulePath: function () {
var path = "";
- var printpath = "(";
+ var printpath = "";
if(this.windowLocationHash.split('#').length -1 > 1) {
for(var i=1; i <= this.windowLocationHash.split('#').length -1; i++) {
if (this.windowLocationHash.split('#').pop() == 'modified') return "";
path += "#"+ this.windowLocationHash.split('#')[i];
- if (i == this.windowLocationHash.split('#').length - 1) printpath += "
" + this.windowLocationHash.split('#')[i] + ""
- else printpath += "
" + this.windowLocationHash.split('#')[i] + " > ";
- } return printpath+")";
+ if (i == this.windowLocationHash.split('#').length - 1) printpath += "
" + this.windowLocationHash.split('#')[i] + ""
+ else printpath += "
" + this.windowLocationHash.split('#')[i] + " > ";
+ } return printpath;
} else return "";
},
rulePath: function () {
diff --git a/backoffice/src/components/Rule.vue b/backoffice/src/components/Rule.vue
index 30d5bfcc3195041b6bc385d688b3d5cde35df998..3e0ff3345cc1b109ad1306905ef1c1bbd8b1423f 100644
--- a/backoffice/src/components/Rule.vue
+++ b/backoffice/src/components/Rule.vue
@@ -7,11 +7,16 @@
{{ displayedName }}
-
({{ this.modification_count }} modifications en cours)
+
+