shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1731 from SevanNerse/master

Browse Source 
dynamic option is upgraded on akaunting select and akaunting select r…
This commit is contained in:
Cüneyt Şentürk 2021-01-05 23:00:03 +03:00 committed by GitHub
commit eeea1f0029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/assets/js/components/AkauntingSelect.vue
View File

@ -689,7 +689,11 @@ export default {
watch: {
selected: function (selected) {
if (!this.multiple) {
this.selected = selected.toString();
if (typeof selected != 'string' && selected !== undefined) {
this.selected = selected.toString();
} else {
this.selected = selected;
}
} else {
if (Array.isArray(this.selected) && !this.selected.length) {
this.selected = selected;
@ -760,6 +764,9 @@ export default {
},
dynamicOptions: function(options) {
this.sort_options = [];
this.selected = '';
if (this.group) {
// Option set sort_option data
if (!Array.isArray(options)) {

9
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@ -900,7 +900,11 @@ export default {
watch: {
selected: function (selected) {
if (!this.multiple) {
this.selected = selected.toString();
if (typeof selected != 'string' && selected !== undefined) {
this.selected = selected.toString();
} else {
this.selected = selected;
}
} else {
if (Array.isArray(this.selected) && !this.selected.length) {
this.selected = selected;
@ -971,6 +975,9 @@ export default {
},
dynamicOptions: function(options) {
this.sort_options = [];
this.selected = '';
if (this.group) {
// Option set sort_option data
if (!Array.isArray(options)) {