From 4589d49a45ca449d88c74227c6a710684c4d4fa4 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 23 Mar 2020 16:23:52 +0300 Subject: [PATCH 1/2] permission update for rotate image --- .../src/Http/Controller/UploadController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index 535112494..cb8b821f9 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -118,8 +118,11 @@ class UploadController extends AdminController $path = explode('/', $parsed['path']); $filename = end($path); - $isImageUser = FilesFilesEntryModel::query()->where('created_by_id', Auth::id()) - ->where('name', $filename)->first(); + $isImageUser = FilesFilesEntryModel::query(); + if (!auth()->user()->hasRole('admin')) { + $isImageUser = $isImageUser->where('created_by_id', Auth::id()); + } + $isImageUser = $isImageUser->where('name', $filename)->first(); if ($isImageUser != null) { WaterMark::make(Storage::path('images/' . $filename))->rotate(90) ->save(app_storage_path() . '/files-module/local/images/' . $filename); From 4b7fd7e9d24f2385f5928bda0bcb7aee40419895 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 23 Mar 2020 18:25:25 +0300 Subject: [PATCH 2/2] show selected sub categories for mobil filter --- .../advs-module/resources/js/filter_modal.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js index 09918cc94..1b599478d 100644 --- a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js +++ b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js @@ -42,6 +42,7 @@ var promiseForCategory = new Promise(function (resolve) { }) level++; } + console.log(all_categories) resolve(all_categories); }); @@ -59,6 +60,24 @@ promiseForCategory.then(function (categories_list) { $('.' + index).append(""); }); }); + level++; + crud({ + 'level': level, + "cat": id_list['cat' + Object.keys(id_list).length] + }, '/class/ajaxCategory', 'POST', function (callback) { + + if(callback.length > 0) + { + $('.category-row').append(CategoryField('cat'+level, level)); + $.each(callback, function (index2, value2) { + selected = ""; + + $('.' + 'cat'+level).append(""); + }); + } + + }) + })