hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 06:46:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1114 from openclassify/dia

Browse Source 
#4316 module on/off options
This commit is contained in:
spektra2147 2021-07-15 12:58:10 +03:00 committed by GitHub
commit f0609df06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/default/visiosoft/advs-module/resources/lang/en/setting.php
View File

@ -133,8 +133,8 @@ return [
], ],
'market_place' => [ 'market_place' => [
'name' => 'Market Place', 'name' => 'Market Place',
'instructions' => 'If the marketplace is down, your site will act as ecommerce. For example, 'instructions' => 'If the marketplace is down, your site will act as ecommerce. For example,
some fields in the profile such as ads, dopings, messages, sale, packages and store are not visible and some fields in the profile such as ads, dopings, messages, sale, packages and store are not visible and
removes corporate membership.' removes corporate membership.'
], ],
'price_area_hidden' => [ 'price_area_hidden' => [

9
addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
View File

@ -246,10 +246,10 @@
</div> </div>
</div> </div>
<h5 class="mt-5 pb-1 border-bottom"> <h5 class="mt-5 pb-1 border-bottom upload-photos-title">
{{ trans('visiosoft.module.advs::field.upload_photos') }} {{ trans('visiosoft.module.advs::field.upload_photos') }}
</h5> </h5>
<div class="bg-light p-4"> <div class="bg-light p-4 upload-photos-wrapper">
<div class="row form-group images"> <div class="row form-group images">
<div class="col-md-12"> <div class="col-md-12">
{{ form.fields.files.input |raw }} {{ form.fields.files.input |raw }}
@ -268,6 +268,9 @@
</div> </div>
</div> </div>
</div> </div>
{{ addBlock('advs/create/under-images-field', {'vars': _context})|raw }}
{% set other_fields = addBlock('new-ad/other-fields',{'custom_fields':custom_fields,'id':id}) %} {% set other_fields = addBlock('new-ad/other-fields',{'custom_fields':custom_fields,'id':id}) %}
{% if other_fields or (custom_fields and count(custom_fields)) %} {% if other_fields or (custom_fields and count(custom_fields)) %}
<h5 class="mt-5 pb-1 border-bottom"> <h5 class="mt-5 pb-1 border-bottom">
@ -338,4 +341,4 @@
{{ asset_add("scripts.js", "streams::js/form/form.js") }} {{ asset_add("scripts.js", "streams::js/form/form.js") }}
{{ asset_add("scripts.js", "streams::js/form/translations.js") }} {{ asset_add("scripts.js", "streams::js/form/translations.js") }}
{% endblock %} {% endblock %}

2
addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig
View File

@ -63,4 +63,4 @@
{{ asset_add("styles.css", "visiosoft.module.advs::css/detail.css") }} {{ asset_add("styles.css", "visiosoft.module.advs::css/detail.css") }}
{{ asset_add("styles.css", "visiosoft.module.advs::css/preview.css") }} {{ asset_add("styles.css", "visiosoft.module.advs::css/preview.css") }}
{% endblock %} {% endblock %}

5
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -505,4 +505,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
{ {
$this->update(['status' => $status]); $this->update(['status' => $status]);
} }
public function canEdit()
{
return $this->created_by_id == \auth()->id() || \auth()->user()->isAdmin();
}
} }

2
addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
View File

@ -91,4 +91,6 @@ interface AdvInterface extends EntryInterface
public function approve(); public function approve();
public function changeStatus($status); public function changeStatus($status);
public function canEdit();
} }

7
addons/default/visiosoft/base-theme/resources/js/modal_include.js
View File

@ -1,5 +1,8 @@
$('.remote').on('show.bs.modal', function (e) { $('.remote').on('show.bs.modal', function (e) {
if (typeof e.relatedTarget !== "undefined") { if (typeof e.relatedTarget !== "undefined") {
$(this).find('.modal-content').load(e.relatedTarget.href); $(this).find('.modal-content').load(e.relatedTarget.href, function () {
const event = new Event('custom.modal.loaded');
$(this).closest('.modal').get(0).dispatchEvent(event);
});
} }
}); });

2
addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php
View File

@ -23,7 +23,7 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider
], ],
TableIsQuerying::class => [ TableIsQuerying::class => [
AddGsmFilter::class, AddGsmFilter::class,
AddViewAdsButton::class AddViewAdsButton::class,
], ],
]; ];