Merge pull request #1082 from openclassify/muammertop

#4034 category edit icon bug
This commit is contained in:
spektra2147 2021-05-20 13:16:46 +03:00 committed by GitHub
commit 3be28b437a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions

View File

@ -33,4 +33,5 @@ return [
'please_wait' => 'Please wait.Deleting Sub Categories',
'category_selection' => 'Category Selection',
'go_to_parent' => 'Go To Parent',
'preview' => 'Preview'
];

View File

@ -30,7 +30,23 @@
{{ form.fields.slug|raw }}
<input type="hidden" name="parent_category"
value="{% if form.fields.parent_category.value.id is defined %}{{ form.fields.parent_category.value.id }}{% elseif app.request.get('parent') is defined %}{{ app.request.get('parent') }}{% endif %}">
{{ form.fields.icon|raw }}
<div class="form-group icon-field input_file-field_type">
<label for="icon" class="control-label">
{{ form.fields.icon.label|raw }}
</label>
<p class="text-muted">
{{ form.fields.icon.instructions|raw }}
</p>
<div class="mb-1">
<span class="text-muted">
{{ trans('visiosoft.module.cats::field.preview') }}:
</span>
{{ form.fields.icon.value
? img(url(form.fields.icon.value)).width(24)|raw
: img('visiosoft.theme.base::images/default-categories-icon.png').width(24)|raw }}
</div>
{{ form.fields.icon.input|raw }}
</div>
{{ form.fields.seo_keyword|raw }}
{{ form.fields.seo_description|raw }}
</div><!-- section -->

View File

@ -34,7 +34,6 @@ class ForgotPassFormHandler
$users->save($user);
if (!is_null($user->gsm_phone)) {
event(new SendForgotPasswordSms($user, $password));
$messages->success(trans('visiosoft.theme.base::message.send_forgot_sms'));
} else {
$messages->error(trans('visiosoft.theme.base::message.found_phone'));
}