merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #929 from rahulshukla-webkul/development 

issue #913 group in attribute family
This commit is contained in:
Jitendra Singh 2019-05-20 17:58:58 +05:30 committed by GitHub
parent 477a20c816 f05d07eb38
commit aac26eb906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
View File

@ -218,9 +218,10 @@
methods: {
addGroup: function (formScope) {
var this_this = this;
this.$validator.validateAll(formScope).then(function (result) {
if (result) {
var this_this = this;
var filteredGroups = groups.filter(function(group) {
return this_this.group.groupName.trim() === (group.name ? group.name.trim() : group.groupName.trim())
@ -238,13 +239,13 @@
});
}
} else {
groups.push(this.group);
groups.push(this_this.group);
groups = this.sortGroups();
groups = this_this.sortGroups();
this.group = {'groupName': '', 'position': '', 'is_user_defined': 1, 'custom_attributes': []};
this.$parent.closeModal();
this_this.$parent.closeModal();
}
}
});

13
packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
View File

@ -216,9 +216,10 @@
methods: {
addGroup: function (formScope) {
this.$validator.validateAll(formScope).then(function(result) {
var this_this = this;
this.$validator.validateAll(formScope).then(function (result) {
if (result) {
var this_this = this;
var filteredGroups = groups.filter(function(group) {
return this_this.group.groupName.trim() === (group.name ? group.name.trim() : group.groupName.trim())
@ -236,13 +237,13 @@
});
}
} else {
groups.push(this.group);
groups.push(this_this.group);
groups = this.sortGroups();
groups = this_this.sortGroups();
this.group = {'groupName': '', 'position': '', 'custom_attributes': []};
this.group = {'groupName': '', 'position': '', 'is_user_defined': 1, 'custom_attributes': []};
this.$parent.closeModal();
this_this.$parent.closeModal();
}
}
});