Merge branch 'fix-issue-9' into 'vue-editor'

fix issue #9 - cancel modification now display modifications list

See merge request !37

backoffice/src/components/Rule.vue

@@ -37,29 +37,34 @@
         </ul>
       </div>
       <div v-show="isEditMode">
-        <div class="container">
-          <div class="row mb-3">
-            <div class="col-md-6 pl-0">
-              <input @click="closeEdit" type="button" class="btn btn-outline-danger pull-left" value="Annuler"/>
+        <div v-if="content">
+          <div class="container">
+            <div class="row mb-3">
+              <div class="col-md-6 pl-0">
+                <input @click="closeEdit" type="button" class="btn btn-outline-danger pull-left" value="Annuler"/>
+              </div>
+              <div class="col-md-6 pr-0">
+                <button v-b-modal.mail-modal class="btn main-button-primary pull-right">Enregistrer</button>
+              </div>
             </div>
-            <div class="col-md-6 pr-0">
-              <button v-b-modal.mail-modal class="btn main-button-primary pull-right">Enregistrer</button>
+            <div class="row mb-3">
+              <label for="content"><u>Contenu de la règle</u></label>
+              <textarea-autosize id="content" v-model="content" class="rule-modification-text" :class="{editErrorClass: error_flags.notModified }"></textarea-autosize>
+              <span v-if="error_flags.notModified" class="text-danger font-weight-light">Aucune modification n'a été renseignée</span>
             </div>
-          </div>
-          <div v-if="content" class="row mb-3">
-            <label for="content"><u>Contenu de la règle</u></label>
-            <textarea-autosize id="content" v-model="content" class="rule-modification-text" :class="{editErrorClass: error_flags.notModified }"></textarea-autosize>
-            <span v-if="error_flags.notModified" class="text-danger font-weight-light">Aucune modification n'a été renseignée</span>
-          </div>
-          <div class="row mb-3">
-            <div class="col-md-6 pl-0">
-              <input @click="closeEdit" type="button" class="btn btn-outline-danger pull-left" value="Annuler"/>
-            </div>
-            <div class="col-md-6 pr-0">
-              <button v-b-modal.mail-modal class="btn main-button-primary pull-right">Enregistrer</button>
+            <div class="row mb-3">
+              <div class="col-md-6 pl-0">
+                <input @click="closeEdit" type="button" class="btn btn-outline-danger pull-left" value="Annuler"/>
+              </div>
+              <div class="col-md-6 pr-0">
+                <button v-b-modal.mail-modal class="btn main-button-primary pull-right">Enregistrer</button>
+              </div>
             </div>
           </div>
         </div>
+        <div v-else class="text-center loading-gif">
+          <img src="./../assets/images/loading.gif" alt="loading...">
+        </div>
         <b-modal id="auth-modal" title="Authentifiez-vous pour soumettre une modification">
           <label for="contributor_email" class="pb-2"><u>Votre email</u> *</label><br>
           <input id="contributor_email" v-model="auth.email" type="text" :class="{editErrorClass: (error_flags.badUser || error_flags.noUser)}" class="form-control" style="border: 1px solid #bfbfbf; border-radius: 2px;"/><br>
@@ -248,6 +253,7 @@
         this.comment = "";
         this.auth = "";
         this.isEditMode=!this.isEditMode;
+        this.viewModification = true;
         this.error_flags = {
           badUser: false,
           notModified: false,