Merge branch 'prod'

web/themes/custom/materiotheme/vuejs/components/Content/ModalCard.vue

@@ -143,7 +143,7 @@
             </section>
             <section class="industriels">
               <!-- <h4 class="label">{{ $t("default.Contact") }}</h4> -->
-              <section v-if="material.manufacturer">
+              <section v-if="material.manufacturer && material.manufacturer.length">
                 <span class="label">{{ $t("materio.Manufacturer") }}</span>
                 <ul>
                   <li v-for="manu in material.manufacturer" v-bind:key="manu.id">
@@ -157,7 +157,7 @@
                   </li>
                 </ul>
               </section>
-              <section v-if="material.distributor">
+              <section v-if="material.distributor && material.distributor.length">
                 <span class="label">{{ $t("materio.Distributor") }}</span>
                 <ul>
                   <li v-for="distrib in material.distributor" v-bind:key="distrib.id">

web/themes/custom/materiotheme/vuejs/store/index.js

@@ -34,12 +34,12 @@ export default createStore(Vuex.Store, {
   // https://github.com/huybuidac/vuex-extensions
   mixins: {
     actions: {
-      loadMaterialsGQL ({ dispatch }, { ids, gqlfragment, callBack, callBackArgs }) {
+      loadMaterialsGQL ({ dispatch }, { ids, gqlfragment, gqlFragmentfields, callBack, callBackArgs }) {
         console.log('loadMaterialsGQL ids', ids)
 
         const ast = gql`{
           materiaux(ids: [${ids}]) {
-            ...MateriauFields
+            ...${gqlFragmentfields}
           }
         }
         ${gqlfragment}

web/themes/custom/materiotheme/vuejs/store/modules/user.js

@@ -332,6 +332,7 @@ export default {
                 dispatch('loadMaterialsGQL', {
                   ids: state.flagcolls[collid].items,
                   gqlfragment: materiauFlaglistGQL,
+                  gqlFragmentfields: 'MateriauFlagListFields',
                   callBack: 'loadMaterialsCallBack',
                   callBackArgs: { collid: collid }
                 }).then(() => {
@@ -370,6 +371,7 @@ export default {
           dispatch('loadMaterialsGQL', {
             ids: state.flagcolls[collid].items,
             gqlfragment: materiauFlaglistGQL,
+            gqlFragmentfields: 'MateriauFlagListFields',
             callBack: 'loadMaterialsCallBack',
             callBackArgs: { collid: collid }
           })