Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-01-28 16:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed badly named permission type to permission category because type should only be read/write/...

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-17 23:01:30 +01:00
parent c91c5a56a5
commit 4c64fd072d
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin/Routes/Web/Api.php
View File

@ -13,7 +13,7 @@
declare(strict_types=1);
use Modules\Media\Controller\ApiController;
use Modules\Media\Models\PermissionState;
use Modules\Media\Models\PermissionCategory;
use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
@ -25,7 +25,7 @@ return [
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
[
@ -34,7 +34,7 @@ return [
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -45,7 +45,7 @@ return [
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -56,7 +56,7 @@ return [
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -67,7 +67,7 @@ return [
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],

16
Admin/Routes/Web/Backend.php
View File

@ -13,7 +13,7 @@
declare(strict_types=1);
use Modules\Media\Controller\BackendController;
use Modules\Media\Models\PermissionState;
use Modules\Media\Models\PermissionCategory;
use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
@ -25,7 +25,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => \Modules\Admin\Models\PermissionState::MODULE,
'state' => \Modules\Admin\Models\PermissionCategory::MODULE,
],
],
],
@ -36,7 +36,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => \Modules\Admin\Models\PermissionState::MODULE,
'state' => \Modules\Admin\Models\PermissionCategory::MODULE,
],
],
],
@ -47,7 +47,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -58,7 +58,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -69,7 +69,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -80,7 +80,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],
@ -91,7 +91,7 @@ return [
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
'state' => PermissionState::MEDIA,
'state' => PermissionCategory::MEDIA,
],
],
],

6
Controller/ApiController.php
View File

@ -25,7 +25,7 @@ use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\NullMediaType;
use Modules\Media\Models\PathSettings;
use Modules\Media\Models\PermissionState;
use Modules\Media\Models\PermissionCategory;
use Modules\Media\Models\UploadFile;
use Modules\Media\Models\UploadStatus;
use Modules\Tag\Models\NullTag;
@ -293,7 +293,7 @@ final class ApiController extends Controller
$app->appName,
self::NAME,
self::NAME,
PermissionState::MEDIA,
PermissionCategory::MEDIA,
$media->getId(),
null,
PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION
@ -532,7 +532,7 @@ final class ApiController extends Controller
{
if (empty($media)
|| !$this->app->accountManager->get($account)->hasPermission(
PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionState::COLLECTION, null)
PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionCategory::COLLECTION, null)
) {
return new NullCollection();
}

8
Controller/BackendController.php
View File

@ -27,7 +27,7 @@ use Modules\Media\Models\MediaTypeMapper;
use Modules\Media\Models\MediaTypeL11nMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PermissionState;
use Modules\Media\Models\PermissionCategory;
use Modules\Media\Theme\Backend\Components\Media\ElementView;
use Modules\Media\Theme\Backend\Components\Media\ListView;
use Modules\Media\Views\MediaView;
@ -84,7 +84,7 @@ final class BackendController extends Controller
$this->app->orgId,
$this->app->appName,
self::NAME,
PermissionState::MEDIA,
PermissionCategory::MEDIA,
);
$mediaMapper = MediaMapper::getByVirtualPath($path)->where('tags/title/language', $request->getLanguage());
@ -96,7 +96,7 @@ final class BackendController extends Controller
->units([null, $this->app->orgId])
->apps([null, 'Api', $this->app->appName])
->modules([null, self::NAME])
->types([null, PermissionState::MEDIA])
->categories([null, PermissionCategory::MEDIA])
->permission(PermissionType::READ)
->query(MediaMapper::PRIMARYFIELD);
@ -115,7 +115,7 @@ final class BackendController extends Controller
->units([null, $this->app->orgId])
->apps([null, 'Api', $this->app->appName])
->modules([null, self::NAME])
->types([null, PermissionState::MEDIA])
->categories([null, PermissionCategory::MEDIA])
->permission(PermissionType::READ)
->query(MediaMapper::PRIMARYFIELD);

2
Models/PermissionState.php → Models/PermissionCategory.php
View File

@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Enum;
* @link https://karaka.app
* @since 1.0.0
*/
abstract class PermissionState extends Enum
abstract class PermissionCategory extends Enum
{
public const MEDIA = 1;