Merge branch 'master' of [email protected]:what-crud/vue-crud.git

Author: szczepanmasny

src/utils/crud/components/ItemDetails.vue

@@ -93,7 +93,7 @@ export default {
     itemData () {
       const result = {}
       for (const field of this.fields) {
-        result[field.column] = field.value ? field.value : null
+        result[field.column] = field.value !== undefined ? field.value : null
       }
       return result
     },

src/utils/crud/components/ItemElements.vue

@@ -144,9 +144,11 @@ export default {
     items () {
       const statusObject = this.itemElements.itemObject
       const { columns } = this.itemElements
+      const connectionKeyName = this.itemElements.connectionKeyName || 'id'
+      const dictionaryKeyName = this.itemElements.dictionaryKeyName || 'id'
       const items = this.itemElements.data.map((item) => {
         const rItem = {}
-        rItem.id = item.id
+        rItem.id = item[dictionaryKeyName]
         for (const column of columns) {
           const prop = column.obj.split('.').reduce((object, property) => object[property] || '', item)
           rItem[column.name] = prop
@@ -155,7 +157,7 @@ export default {
           if (item[statusObject].length > 0) {
             rItem.added = '<span hidden>1</span>Tak'
             rItem.filterStatus = 1
-            rItem.connectionId = item[statusObject][0].id
+            rItem.connectionId = item[statusObject][0][connectionKeyName]
           } else {
             rItem.added = '<span hidden>0</span>Nie'
             rItem.filterStatus = 0

src/utils/crud/mixins/child.js

@@ -72,21 +72,21 @@ export default {
       this.createChildDialog(this.childItemName)
     },
     suspend (id) {
+      let obj = {}
+      obj[this.activeColumnName] = 0
       this.updateChild([
         id,
-        {
-          active: 0
-        },
+        obj,
         this.$t('global.alerts.suspended'),
         this.path
       ])
     },
     restore (id) {
+      let obj = {}
+      obj[this.activeColumnName] = 1
       this.updateChild([
         id,
-        {
-          active: 1
-        },
+        obj,
         this.$t('global.alerts.restored'),
         this.path
       ])

src/utils/crud/store/mutations.js

@@ -92,6 +92,8 @@ const mutations = {
     state.itemElements.itemObject = obj.itemObject
     state.itemElements.primaryId = obj.primaryId
     state.itemElements.foreignId = obj.foreignId
+    state.itemElements.connectionKeyName = obj.connectionKeyName
+    state.itemElements.dictionaryKeyName = obj.dictionaryKeyName
     state.itemElements.show = true
   },
   openImageContainer (state, item) {