Skip to content

Commit 256af25

Browse files
authored
add validation the isDisplayedGrid to table (#783)
* add validation the isDisplayedGrid to table * minimalchanges
1 parent 3ddba45 commit 256af25

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

src/components/ADempiere/ContextMenu/contextMenuDesktop.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ export default {
248248
return 'skill'
249249
}
250250
},
251+
created() {
252+
this.generateContextMenu()
253+
this.getReferences()
254+
},
251255
methods: {
252256
clickRelation(item) {
253257
this.$router.push({

src/components/ADempiere/ContextMenu/contextMenuMixin.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,6 @@ export default {
276276
}
277277
}
278278
},
279-
created() {
280-
this.generateContextMenu()
281-
},
282-
mounted() {
283-
this.getReferences()
284-
},
285279
methods: {
286280
showNotification,
287281
actionContextMenu(event) {
@@ -427,7 +421,9 @@ export default {
427421
return item
428422
}
429423
})
430-
this.$store.dispatch('setOrder', processAction)
424+
if (processAction) {
425+
this.$store.dispatch('setOrder', processAction)
426+
}
431427
}
432428
if (this.isWindow && this.isEmptyValue(this.actions.find(element => element.action === 'recordAccess'))) {
433429
this.$store.dispatch('addAttribute', {

src/components/ADempiere/ContextMenu/contextMenuMobile.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ export default {
202202
return 'skill'
203203
}
204204
},
205+
created() {
206+
this.generateContextMenu()
207+
this.getReferences()
208+
},
205209
methods: {
206210
clickRelation(item) {
207211
this.$router.push({

src/components/ADempiere/DataTable/dataTables-Script.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,12 @@ export default {
344344
})
345345
},
346346
headerLabel(field) {
347-
if (field.isMandatory || field.isMandatoryFromLogic) {
347+
if (field.isMandatory || field.isMandatoryFromLogic && field.isDisplayedGrid) {
348348
return '* ' + field.name
349349
}
350-
return field.name
350+
if (field.isDisplayedGrid) {
351+
return field.name
352+
}
351353
},
352354
/**
353355
* @param {object} row, row data

0 commit comments

Comments
 (0)