Merge branch 'develop' into generic_modal_v2

vue/src/apps/MealPlanView/MealPlanView.vue

@@ -136,22 +136,22 @@
     <ContextMenu ref="menu">
       <template #menu="{ contextData }">
         <ContextMenuItem @click="$refs.menu.close();openEntryEdit(contextData.originalItem.entry)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-pen"></i> {{ $t("Edit") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-pen"></i> {{ $t("Edit") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();moveEntryLeft(contextData)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-arrow-left"></i> {{ $t("Move") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-arrow-left"></i> {{ $t("Move") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();moveEntryRight(contextData)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-arrow-right"></i> {{ $t("Move") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-arrow-right"></i> {{ $t("Move") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();createEntry(contextData.originalItem.entry)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-copy"></i> {{ $t("Clone") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-copy"></i> {{ $t("Clone") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();addToShopping(contextData)">
-          <a class="dropdown-item p-2" href="#"><i class="fas fa-shopping-cart"></i> {{ $t("Add_to_Shopping") }}</a>
+          <a class="dropdown-item p-2" href="javascript:void(0)"><i class="fas fa-shopping-cart"></i> {{ $t("Add_to_Shopping") }}</a>
         </ContextMenuItem>
         <ContextMenuItem @click="$refs.menu.close();deleteEntry(contextData)">
-          <a class="dropdown-item p-2 text-danger" href="#"><i class="fas fa-trash"></i> {{ $t("Delete") }}</a>
+          <a class="dropdown-item p-2 text-danger" href="javascript:void(0)"><i class="fas fa-trash"></i> {{ $t("Delete") }}</a>
         </ContextMenuItem>
       </template>
     </ContextMenu>
@@ -513,11 +513,17 @@ export default {
         return entry.id === id
       })[0]
     },
-    moveEntry(null_object, target_date) {
+    moveEntry(null_object, target_date, drag_event) {
       this.plan_entries.forEach((entry) => {
         if (entry.id === this.dragged_item.id) {
-          entry.date = target_date
-          this.saveEntry(entry)
+          if (drag_event.ctrlKey) {
+            let new_entry = Object.assign({}, entry)
+            new_entry.date = target_date
+            this.createEntry(new_entry)
+          } else {
+            entry.date = target_date
+            this.saveEntry(entry)
+          }
         }
       })
     },

vue/src/components/CookbookToc.vue

@@ -6,7 +6,7 @@
     <b-card-body class="p-4">
       <ol style="max-height: 60vh;overflow-y:auto;-webkit-overflow-scrolling: touch;" class="mb-1">
         <li v-for="(recipe, index) in recipes" v-bind:key="index" v-on:click="$emit('switchRecipe', index)">
-          <a href="#">{{ recipe.recipe_content.name }} <recipe-rating :recipe="recipe"></recipe-rating> </a>
+          <a href="javascript:void(0)">{{ recipe.recipe_content.name }} <recipe-rating :recipe="recipe"></recipe-rating> </a>
         </li>
       </ol>
       <b-card-text v-if="recipes.length === 0">

vue/src/components/GenericMultiselect.vue

@@ -116,6 +116,8 @@ export default {
 }
 </script>
 
+<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
+
 <style scoped>
 
 </style>

vue/src/components/MealPlanEditModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <b-modal :id="modal_id" size="lg" :title="modal_title" hide-footer aria-label="">
+  <b-modal :id="modal_id" size="lg" :title="modal_title" hide-footer aria-label="" @show="showModal">
     <div class="row">
       <div class="col col-md-12">
         <div class="row">
@@ -60,6 +60,18 @@
                             :placeholder="$t('Servings')"></b-form-input>
             </b-input-group>
             <small tabindex="-1" class="form-text text-muted">{{ $t("Servings") }}</small>
+            <b-form-group class="mt-3">
+              <generic-multiselect required
+                                   @change="entryEditing.shared = $event.val" parent_variable="entryEditing.shared"
+                                   :label="'username'"
+                                   :model="Models.USER_NAME"
+                                   style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
+                                   v-bind:placeholder="$t('Share')" :limit="10"
+                                   :multiple="true"
+                                   :initial_selection="entryEditing.shared"
+              ></generic-multiselect>
+              <small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
+            </b-form-group>
           </div>
           <div class="col-lg-6 d-none d-lg-block d-xl-block">
             <recipe-card :recipe="entryEditing.recipe" v-if="entryEditing.recipe != null"></recipe-card>
@@ -103,7 +115,7 @@ export default {
     allow_delete: {
       type: Boolean,
       default: true
-    },
+    }
   },
   mixins: [ApiMixin],
   components: {
@@ -114,7 +126,8 @@ export default {
     return {
       entryEditing: {},
       missing_recipe: false,
-      missing_meal_type: false
+      missing_meal_type: false,
+      default_plan_share: []
     }
   },
   watch: {
@@ -126,6 +139,15 @@ export default {
     }
   },
   methods: {
+    showModal() {
+      let apiClient = new ApiApiFactory()
+
+      apiClient.listUserPreferences().then(result => {
+        if (this.entry.id === -1) {
+          this.entryEditing.shared = result.data[0].plan_share
+        }
+      })
+    },
     editEntry() {
       this.missing_meal_type = false
       this.missing_recipe = false
@@ -155,6 +177,13 @@ export default {
         this.entryEditing.meal_type = null;
       }
     },
+    selectShared(event) {
+      if (event.val != null) {
+        this.entryEditing.shared = event.val;
+      } else {
+        this.entryEditing.meal_type = null;
+      }
+    },
     createMealType(event) {
       if (event != "") {
         let apiClient = new ApiApiFactory()

vue/src/components/RecipeContextMenu.vue

@@ -2,7 +2,7 @@
   <div>
 
     <div class="dropdown d-print-none">
-      <a class="btn shadow-none" href="#" role="button" id="dropdownMenuLink"
+      <a class="btn shadow-none" href="javascript:void(0);" role="button" id="dropdownMenuLink"
          data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="fas fa-ellipsis-v fa-lg"></i>
       </a>
@@ -15,7 +15,7 @@
         <a class="dropdown-item" :href="resolveDjangoUrl('edit_convert_recipe', recipe.id)" v-if="!recipe.internal"><i
             class="fas fa-exchange-alt fa-fw"></i> {{ $t('convert_internal') }}</a>
 
-        <a href="#">
+        <a href="javascript:void(0);">
           <button class="dropdown-item" @click="$bvModal.show(`id_modal_add_book_${modal_id}`)">
             <i class="fas fa-bookmark fa-fw"></i> {{ $t('Manage_Books') }}
           </button>
@@ -26,17 +26,17 @@
           <i class="fas fa-shopping-cart fa-fw"></i> {{ $t('Add_to_Shopping') }}
         </a>
 
-        <a class="dropdown-item" @click="createMealPlan" href="#"><i
+        <a class="dropdown-item" @click="createMealPlan" href="javascript:void(0);"><i
             class="fas fa-calendar fa-fw"></i> {{ $t('Add_to_Plan') }}
         </a>
 
-        <a href="#">
+        <a href="javascript:void(0);">
           <button class="dropdown-item" @click="$bvModal.show(`id_modal_cook_log_${modal_id}`)"><i
               class="fas fa-clipboard-list fa-fw"></i> {{ $t('Log_Cooking') }}
           </button>
         </a>
 
-        <a href="#">
+        <a href="javascript:void(0);">
           <button class="dropdown-item" onclick="window.print()"><i
               class="fas fa-print fa-fw"></i> {{ $t('Print') }}
           </button>
@@ -45,7 +45,7 @@
         <a class="dropdown-item" :href="resolveDjangoUrl('view_export') + '?r=' + recipe.id" target="_blank"
            rel="noopener noreferrer"><i class="fas fa-file-export fa-fw"></i> {{ $t('Export') }}</a>
 
-        <a href="#">
+        <a href="javascript:void(0);">
           <button class="dropdown-item" @click="createShareLink()" v-if="recipe.internal"><i
               class="fas fa-share-alt fa-fw"></i> {{ $t('Share') }}
           </button>

vue/src/locales/en.json

@@ -213,5 +213,6 @@
     "Clear": "Clear",
     "err_move_self": "Cannot move item to itself",
     "nothing": "Nothing to do",
-    "err_merge_self": "Cannot merge item with itself"
+    "err_merge_self": "Cannot merge item with itself",
+    "show_sql": "Show SQL"
 }