From 64eabf9128258469767064739c8d3d88cdf3c628 Mon Sep 17 00:00:00 2001
From: Praesidiarius <n.kammermann@swiss-crypto-mining.com>
Date: Sun, 8 Mar 2020 05:02:49 +0100
Subject: [PATCH] support for nolabel entities. webgallery

---
 module/Application/config/module.config.php            | 2 +-
 module/Application/data/data.sql                       | 2 +-
 module/Application/src/Controller/UploadController.php | 2 +-
 module/Application/view/partial/webgallery-edit.phtml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index 64699d6..03e4751 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -55,7 +55,7 @@
                 ],
             ],
             'uppy-togglepub' => [
-                'type'    => Literal::class,
+                'type'    => Segment::class,
                 'options' => [
                     'route'    => '/uppy/togglemediapub[/:id]',
                     'constraints' => [
diff --git a/module/Application/data/data.sql b/module/Application/data/data.sql
index 750c476..a8b0345 100644
--- a/module/Application/data/data.sql
+++ b/module/Application/data/data.sql
@@ -18,7 +18,7 @@ INSERT INTO `permission` (`permission_key`, `module`, `label`, `nav_label`, `nav
 ('themes', 'Application\\Controller\\IndexController', 'Theme Selection', '', '/application/themes', 0, 0),
 ('filepond', 'Application\\Controller\\UploadController', 'Upload Featured Image', '', '', 0, 0),
 ('uppy', 'Application\\Controller\\UploadController', 'Gallery Upload', '', '', 0, 0),
-('togglemediapub', 'Application\\Controller\\UploadController', 'Gallery Upload', '', '', 0, 0),
+('togglemediapub', 'Application\\Controller\\UploadController', 'Gallery Sorting', '', '', 0, 0),
 ('updateuppysort', 'Application\\Controller\\UploadController', 'Gallery Upload', '', '', 0, 0),
 ('quicksearch', 'Application\\Controller\\IndexController', 'Quick Search', '', '', 0, 0),
 ('updatefieldsort', 'Application\\Controller\\IndexController', 'Update Form Field Sorting', '', '', 0, 0),
diff --git a/module/Application/src/Controller/UploadController.php b/module/Application/src/Controller/UploadController.php
index 7037289..35e2c7d 100644
--- a/module/Application/src/Controller/UploadController.php
+++ b/module/Application/src/Controller/UploadController.php
@@ -283,7 +283,7 @@ public function togglemediapubAction() {
                 $bPublic = ($oMedia->is_public == 1) ? 0 : 1;
                 $oGalleryTbl->update(['is_public'=>$bPublic],'Media_ID = '.$iMediaID);
 
-                return $this->redirect()->toRoute($oMedia->entity_type,['action'=>'view','id'=>$oMedia->entity_idfs]);
+                return $this->redirect()->toRoute($oMedia->entity_type,['action'=>'edit','id'=>$oMedia->entity_idfs]);
 
             }
         }
diff --git a/module/Application/view/partial/webgallery-edit.phtml b/module/Application/view/partial/webgallery-edit.phtml
index 12a33c6..0b1b4fb 100644
--- a/module/Application/view/partial/webgallery-edit.phtml
+++ b/module/Application/view/partial/webgallery-edit.phtml
@@ -31,7 +31,7 @@ $aImages = CoreController::$aCoreTables['core-gallery-media']->selectWith($oImgS
                     </div>
                     <div class="col-md-2">
                         <?=($oImg->is_public == 1) ? '<i class="fas fa-eye"></i> '.$this->translate('Is showed') : '<i class="fas fa-eye-slash"></i> '.$this->translate('Not showed')?>
-                        <br/><?=($oImg->is_public == 1) ? '<a class="btn btn-dark" href="/uppy/togglemediapub/'.$oImg->Media_ID.'">'.$this->translate('Hide').'</a>' : '<a class="btn btn-dark" href="/application/togglemediapub/'.$oImg->Media_ID.'">'.$this->translate('Show').'</a>'?>
+                        <br/><?=($oImg->is_public == 1) ? '<a class="btn btn-dark" href="/uppy/togglemediapub/'.$oImg->Media_ID.'">'.$this->translate('Hide').'</a>' : '<a class="btn btn-dark" href="/uppy/togglemediapub/'.$oImg->Media_ID.'">'.$this->translate('Show').'</a>'?>
                     </div>
                 </div>
             </li>