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

Merge pull request #6659 from akathuria289/issue_6461 

Fixed issue #6461
This commit is contained in:
Jitendra Singh 2022-08-29 11:17:01 +05:30 committed by GitHub
parent 596b9dcfc6 ddf1d5a5f6
commit 555fd43383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
View File

@ -313,7 +313,7 @@
<td> <td>
<div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']"> <div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
<input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/> <input type="text" v-validate="getOptionValidation(row,'')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
<span class="control-error" v-if="errors.has(adminName(row))">@{{ errors.first(adminName(row)) }}</span> <span class="control-error" v-if="errors.has(adminName(row))">@{{ errors.first(adminName(row)) }}</span>
</div> </div>
</td> </td>
@ -329,7 +329,7 @@
<td> <td>
<div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']"> <div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
<input type="text" v-validate="'required|numeric'" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/> <input type="text" v-validate="getOptionValidation(row,'')" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
<span class="control-error" v-if="errors.has(sortOrderName(row))">@{{ errors.first(sortOrderName(row)) }}</span> <span class="control-error" v-if="errors.has(sortOrderName(row))">@{{ errors.first(sortOrderName(row)) }}</span>
</div> </div>
</td> </td>
@ -458,7 +458,7 @@
return ''; return '';
} }
return ('{{ app()->getLocale() }}' === localeCode) ? 'required' : ''; return ('{{ app()->getLocale() }}' === localeCode) || localeCode == "" ? 'required' : '';
} }
}, },

10
packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
View File

@ -387,7 +387,7 @@
<td> <td>
<div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']"> <div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
<input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/> <input type="text" v-validate="getOptionValidation(row, '')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
<span class="control-error" v-if="errors.has(adminName(row))" v-text="errors.first(adminName(row))"></span> <span class="control-error" v-if="errors.has(adminName(row))" v-text="errors.first(adminName(row))"></span>
</div> </div>
</td> </td>
@ -401,7 +401,7 @@
<td> <td>
<div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']"> <div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
<input type="text" v-validate="'required|numeric'" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/> <input type="text" v-validate="getOptionValidation(row, '')" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
<span class="control-error" v-if="errors.has(sortOrderName(row))" v-text="errors.first(sortOrderName(row))"></span> <span class="control-error" v-if="errors.has(sortOrderName(row))" v-text="errors.first(sortOrderName(row))"></span>
</div> </div>
</td> </td>
@ -506,10 +506,12 @@
'isDelete': false, 'isDelete': false,
}; };
if (option.label) { if (! option.label) {
self.isNullOptionChecked = true; self.isNullOptionChecked = true;
self.idNullOption = option.id; self.idNullOption = option.id;
row['notRequired'] = true; row['notRequired'] = true;
} else {
row['notRequired'] = false;
} }
option.translations.forEach((translation) => { option.translations.forEach((translation) => {
@ -596,7 +598,7 @@
return ''; return '';
} }
return (this.appLocale === localeCode) ? 'required' : ''; return ('{{ app()->getLocale() }}' === localeCode) || localeCode == "" ? 'required' : '';
}, },
}, },
}); });