Skip to content

Commit 4b53e52

Browse files
committed
modified details fields selection method, updated templates
1 parent 9d9ee5b commit 4b53e52

File tree

17 files changed

+163
-81
lines changed

17 files changed

+163
-81
lines changed

src/crud/components/ItemDetails.vue

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<div
1010
v-for="(field, i) in fields"
1111
:key="i"
12-
v-if="field.multipleUpdate || details.action != 'multiedit'"
1312
>
1413
<v-layout row wrap>
1514
<v-flex class="sm1" v-if="details.action == 'multiedit'">
@@ -385,18 +384,24 @@ export default {
385384
...mapState(["uploadPath"]),
386385
...mapState("crud", ["details", "path", "prefix", "selectedIds"]),
387386
fields() {
388-
let self = this;
389-
let result = this.detailsFields.map(field => {
387+
let self = this
388+
let fields = this.detailsFields.filter(field => {
389+
let isIncluded = true
390+
if(this.details.action == 'create'){
391+
isIncluded = field.create == false ? false : true
392+
}
393+
else if (this.details.action == 'multiedit'){
394+
isIncluded = field.multiedit == false ? false : true
395+
}
396+
return isIncluded
397+
})
398+
let result = fields.map(field => {
390399
let rField = field;
391-
rField.multipleUpdate =
392-
field.multipleUpdate != undefined ? field.multipleUpdate : true;
393400
rField.value = this.details.item[field.column];
394401
if (typeof rField.value != "undefined") {
395402
if (field.type == "select") {
396403
let defaultVal = field.list.default || 1
397-
rField.value = field.stringId
398-
? this.details.item[field.column]
399-
: parseInt(this.details.item[field.column]) || defaultVal;
404+
rField.value = field.stringId ? this.details.item[field.column] : parseInt(this.details.item[field.column]) || defaultVal;
400405
} else if (field.type == "datePicker") {
401406
rField.value = this.details.item[field.column].substring(0, 10);
402407
} else if (field.type == "checkbox") {

src/crud/mixins/extended-controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
];
3131
},
3232
itemFields() {
33-
return this.fieldsInfo.filter(field => field.hidden != true);
33+
return this.fieldsInfo.filter(field => field.details != false);
3434
}
3535
},
3636
methods: {

templates/routes/administration/routes/permissions/Index.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,15 @@
5555
type: 'input',
5656
column: 'name',
5757
text: this.$t('fields.name'),
58-
name: 'name'
58+
name: 'name',
59+
multiedit: false
5960
},
6061
{
6162
type: 'input',
6263
column: 'code',
6364
text: this.$t('fields.code'),
64-
name: 'code'
65+
name: 'code',
66+
multiedit: false
6567
},
6668
]
6769
},

templates/routes/administration/routes/user-permissions/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
name: 'user',
4343
apiObject: {
4444
name: 'user.name',
45-
}
45+
},
4646
},
4747
{
4848
text: this.$t('fields.userEmail'),

templates/routes/administration/routes/users/Index.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@
6262
type: 'input',
6363
column: 'name',
6464
text: this.$t('fields.name'),
65-
name: 'name'
65+
name: 'name',
66+
multiedit: false
6667
},
6768
{
6869
type: 'input',
6970
column: 'email',
7071
text: this.$t('fields.email'),
71-
name: 'email'
72+
name: 'email',
73+
multiedit: false
7274
},
7375
{
7476
type: 'select',

templates/routes/crm/routes/companies/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default {
4949
name: "goToItem",
5050
icon: "forward",
5151
color: "blue",
52-
text: this.$t("global.details.title")
52+
text: this.$t("buttons.goToItem")
5353
},
5454
]
5555
},

0 commit comments

Comments
 (0)