Merge pull request #215 from openclassify/vedat

Vedat
This commit is contained in:
Fatih Alp 2020-01-10 08:36:26 +03:00 committed by GitHub
commit 9d3756e887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 17 deletions

View File

@ -37,9 +37,15 @@
<fieldset>
<div class="section postdetails">
<div class="row form-group add-title">
{% set fields = form.fields.base().pluck('field_name').all() %}
<div class="col-md-12">
{{ nameField|raw }}
<div class="field-group name">
{% for field in form.fields.translations('name') %}
{{ field.render({'form': form})|raw }}
{% endfor %}
</div>
</div>
<div style="display: none">
{{ form.fields.slug|raw }}
</div>
@ -62,7 +68,11 @@
<div class="row form-group brand-name">
<div class="col-md-12">
{{ descField|raw }}
<div class="field-group advs_desc">
{% for field in form.fields.translations('advs_desc') %}
{{ field.render({'form': form})|raw }}
{% endfor %}
</div>
</div>
</div>
<div class="row form-group images">
@ -113,4 +123,7 @@
type="text/javascript"></script>
{{ asset_add("scripts.js", "visiosoft.module.advs::js/new-create.js") }}
{{ asset_add("scripts.js", "visiosoft.module.advs::js/location.js") }}
{{ asset_add("scripts.js", "streams::js/form/form.js") }}
{{ asset_add("scripts.js", "streams::js/form/translations.js") }}
{% endblock %}

View File

@ -652,20 +652,6 @@ class AdvsController extends PublicController
AdvModel $advModel
)
{
$Field = HTMLDomParser::str_get_html($advFormBuilder->render($id)->getContent());
$nameField = $Field->find('.name', 0);
if ($nameField !== null) {
$nameField = $nameField->innertext();
} else {
$nameField = "";
}
$descField = $Field->find('.advs_desc', 0);
if ($descField !== null) {
$descField = $descField->innertext();
} else {
$nameField = "";
}
if (!Auth::user()) {
redirect('/login?redirect=' . url()->current())->send();
}
@ -714,7 +700,7 @@ class AdvsController extends PublicController
$custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->edit($adv, $categories, $cats);
}
return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact('id', 'cats_d', 'request', 'Cloudinary', 'cities', 'adv', 'custom_fields', 'nameField', 'descField'));
return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact('id', 'cats_d', 'request', 'Cloudinary', 'cities', 'adv', 'custom_fields'));
}
public function destroy($id)