Merge branch 'master' into greenkeeper/sass-loader-7.0.0

components/forms/PybossaForm.vue

@@ -168,10 +168,11 @@ export default {
     process () {
       this.processing = true
       this.alert = ''
+
       return this.$axios({
         method: this.form.method,
         url: this.form.endpoint,
-        data: this.form.model,
+        data: this.getModel(),
         params: this.form.params || {},
         headers: {
           'X-CSRFToken': this.form.model.csrf
@@ -235,6 +236,26 @@ export default {
       })
     },
 
+    /**
+     * Return the form model after converting any multiselect fields.
+     */
+    getModel () {
+      const modelCopy = JSON.parse(JSON.stringify(this.form.model))
+      const multiselectFields = this.form.schema.fields.filter(field => {
+        return field.type === 'vueMultiSelect'
+      })
+
+      for (let field of multiselectFields) {
+        let value = modelCopy[field.model]
+        if (Array.isArray(value)) {
+          modelCopy[field.model] = value.map(item => (item.id))
+        } else if (value) {
+          modelCopy[field.model] = value.id
+        }
+      }
+      return modelCopy
+    },
+
     /**
      * Emit success and go to next, if present.
      * @param {Object} data

components/modals/AddFormField.vue

@@ -64,7 +64,7 @@ export default {
                 ]
               },
               selectOptions: {
-                hideNoneSelected: true
+                hideNoneSelectedText: true
               },
               validator: (value) => {
                 if (!value || !value.length) {
@@ -89,7 +89,7 @@ export default {
                 return model.type !== 'input'
               },
               selectOptions: {
-                hideNoneSelected: true
+                hideNoneSelectedText: true
               },
               validator: (value, field, model) => {
                 if ((!value || !value.length) && model.type === 'input') {

layouts/admin-collection-dashboard.vue

@@ -69,15 +69,6 @@ export default {
               }
             }
           },
-          {
-            label: 'Exports',
-            link: {
-              name: 'admin-collection-short_name-exports',
-              params: {
-                short_name: this.currentCollection.short_name
-              }
-            }
-          },
           {
             label: 'Featured Projects',
             link: {

layouts/bases/Tabs.vue

@@ -47,11 +47,11 @@ export default {
     },
     backgroundImageUrl: {
       type: String,
-      required: true
+      default: ''
     },
     navbarBrand: {
       type: String,
-      required: true
+      default: ''
     }
   },
 

layouts/collection-default.vue

@@ -22,7 +22,10 @@ export default {
     },
 
     backgroundImageUrl () {
-      if (this.currentCollection.info.background) {
+      if (
+        typeof this.currentCollection.info !== 'undefined' &&
+        this.currentCollection.info.background
+      ) {
         return this.currentCollection.info.background
       }
       return '~/assets/img/app-background.jpg'

layouts/collection-tabs.vue

@@ -25,7 +25,10 @@ export default {
     },
 
     backgroundImageUrl () {
-      if (this.currentCollection.info.background) {
+      if (
+        typeof this.currentCollection.info !== 'undefined' &&
+        this.currentCollection.info.background
+      ) {
         return this.currentCollection.info.background
       }
       return '~/assets/img/app-background.jpg'

package.json

@@ -21,11 +21,11 @@
     "@nuxtjs/proxy": "^1.1.4",
     "@nuxtjs/pwa": "^2.0.2",
     "@nuxtjs/sentry": "^1.0.3",
-    "bootstrap": "4.0.0",
+    "bootstrap": "4.1.1",
     "bootstrap-vue": "^2.0.0-rc.6",
     "capitalize": "^1.0.0",
     "chartist-plugin-tooltips": "0.0.17",
-    "clipboard": "^1.7.1",
+    "clipboard": "^2.0.1",
     "cookie": "^0.3.1",
     "cookieconsent": "^3.0.4",
     "croppie": "^2.5.0",