Merge pull request #1199 from openclassify/vedat

fix advanced edit
This commit is contained in:
Fatih Alp 2021-10-14 17:44:38 +03:00 committed by GitHub
commit 82dda696d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 10 deletions

View File

@ -1,6 +1,6 @@
{{ asset_add("scripts.js", "streams::js/table/table.js") }} {{ asset_add("scripts.js", "streams::js/table/table.js") }}
{% if not actions.empty() %} {% if not actions.isEmpty() %}
{{ asset_add("scripts.js", "streams::js/table/actions.js") }} {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
{% endif %} {% endif %}
@ -15,11 +15,11 @@
{{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }} {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
{% if not table.rows.empty() %} {% if not table.rows.isEmpty() %}
{% block card %} {% block card %}
<div class="card"> <div class="card">
{{ form_open({ 'url': url_full() }) }} {{ form_open({ 'url': table.options.url ?: url_full() }) }}
<div class="table-stack"> <div class="table-stack">
<table <table
class=" class="
@ -39,13 +39,15 @@
{% if table.options.sortable %} {% if table.options.sortable %}
<td> <td>
{{ icon('fa fa-arrows handle') }} {{ icon('fa fa-arrows handle') }}
<input type="hidden" name="{{ row.table.options.prefix }}order[]" value="{{ row.key }}"/> <input type="hidden" name="{{ row.table.options.prefix }}order[]"
value="{{ row.key }}"/>
</td> </td>
{% endif %} {% endif %}
{% if not table.actions.empty() %} {% if not table.actions.isEmpty() %}
<td> <td>
<input type="checkbox" data-toggle="action" name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/> <input type="checkbox" data-toggle="action"
name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/>
</td> </td>
{% endif %} {% endif %}
@ -83,8 +85,10 @@
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% endif %} {% endif %}
</div> </div>
<script> <script>
var advanced_update_url = "{{ url_route('visiosoft.module.advs::ajax_multiple_update') }}"; var advanced_update_url = "{{ url_route('visiosoft.module.advs::ajax_multiple_update') }}";
</script> </script>

View File

@ -21,7 +21,7 @@
<div id="pageTitle" class="d-flex justify-content-between border-bottom pb-2 px-3 mb-3"> <div id="pageTitle" class="d-flex justify-content-between border-bottom pb-2 px-3 mb-3">
<p> <p>
{{ trans('visiosoft.module.advs::field.search_ad_result_text', { {{ trans('visiosoft.module.advs::field.search_ad_result_text', {
'count': advs.total, 'count': (advs.total+featured_advs.total),
'name': catText ? catText : '', 'name': catText ? catText : '',
})|raw }} })|raw }}
</p> </p>

View File

@ -25,6 +25,8 @@
{% endif %} {% endif %}
<div id="mobileListing"> <div id="mobileListing">
{{ addBlock('ad-list/partials/mobile-list', {'featured_advs': featured_advs, 'vars': _context})|raw }}
{% for adv in advs %} {% for adv in advs %}
<a href="{{ adv.detail_url }}" class="listing-item d-flex p-2"> <a href="{{ adv.detail_url }}" class="listing-item d-flex p-2">
<img src="{{ adv.cover_photo }}" alt="{{ adv.name }}" class="rounded-sm"> <img src="{{ adv.cover_photo }}" alt="{{ adv.name }}" class="rounded-sm">

View File

@ -51,7 +51,9 @@ class AdvTableBuilder extends TableBuilder
protected $options = [ protected $options = [
'order_by' => [ 'order_by' => [
'id' => 'DESC', 'id' => 'DESC',
] ],
'table_view' => 'visiosoft.module.advs::admin/table/table'
]; ];
protected $assets = [ protected $assets = [

View File

@ -45,7 +45,7 @@ class AddViewAdsButton
$dropdown = array_merge($buttons['settings']['dropdown'], [ $dropdown = array_merge($buttons['settings']['dropdown'], [
"ads" => [ "ads" => [
"text" => trans('visiosoft.theme.defaultadmin::button.view_ads'), "text" => trans('visiosoft.theme.defaultadmin::button.view_ads'),
"href" => "admin/advs?filter_User={entry.id}" "href" => "admin/advs?filter_user={entry.id}"
] ]
]); ]);
$buttons['settings']['dropdown'] = $dropdown; $buttons['settings']['dropdown'] = $dropdown;