From 235ce5716edc2f7cbe80fdccf26eac7269587839 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 08 Jun 2026 04:38:18 +0000
Subject: [PATCH] =FavouritesManager.php and FavouritesRoutes.php fixes. Moving all logic to FavouritesManager.php. Still some left to do
---
inc/helpers/crud.php | 36 ++++++++++--------------------------
1 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/inc/helpers/crud.php b/inc/helpers/crud.php
index 6245bff..dc646c9 100644
--- a/inc/helpers/crud.php
+++ b/inc/helpers/crud.php
@@ -5,6 +5,7 @@
}
use JVBase\managers\Cache;
+use JVBase\managers\RoleManager;
use JVBase\meta\Form;
use JVBase\registrar\Registrar;
@@ -94,10 +95,8 @@
'label' => 'Scrapped',
]
];
- $permission = ($content === 'news') ? 'update' : $content;
- $permission = JVB_CONTENT[$content]['plural']??$content.'s';
-
- $canPublish = current_user_can("publish_{$permission}");
+ $permission = JVB()->roles()->getContentPlural($content);
+ $canPublish = current_user_can("publish_{$permission}") && current_user_can('skip_moderation');
$out = '<div class="filters">';
if (!empty($statusFilters)) {
$out .= '<div class="status">';
@@ -173,9 +172,6 @@
*/
function jvbGetBulkActions(string $content):array
{
-
- $permission = ($content === 'news') ? 'update' : $content;
- $permission = JVB_CONTENT[$content]['plural']??$content.'s';
$bulkActions = [
'publish' => [
'icon' => 'show',
@@ -198,7 +194,8 @@
'disabled' => true,
]
];
- if (current_user_can("publish_{$permission}")) {
+ $permission = JVB()->roles()->getContentPlural($content);
+ if (current_user_can('skip_moderation') && current_user_can("publish_{$permission}")) {
$bulkActions['publish']['disabled'] = false;
}
if (current_user_can("edit_{$permission}")) {
@@ -311,28 +308,15 @@
string $postType = '',
bool $prefix = false
):void {
- switch ($contentType) {
- case 'post':
- $settings = JVB_CONTENT;
- break;
- case 'term':
- $settings = JVB_TAXONOMY;
- break;
- case 'user':
- $settings = JVB_USER;
- break;
- default:
- return;
- }
- $sections = $settings[$postType]['sections']??[];
- if (empty($sections)) {
+ $registrar = Registrar::getInstance($postType);
+ if (!$registrar || empty($registrar->getSections())) {
return;
}
echo '<div class="container">';
- $nav = '<nav class="tabs row start" role="tablist">';
+ $nav = '<nav class="tabs row left" role="tablist">';
$i = 1;
- foreach ($sections as $slug => $section) {
+ foreach ($registrar->getSections() as $slug => $section) {
$nav .= '<button type="button" class="tab';
$ariaActive = 'false';
@@ -354,7 +338,7 @@
data-object-id="<?=$ID?>" data-content-type="<?=$postType?>">
<?php
$i = 0;
- foreach ($sections as $slug => $section) {
+ foreach ($registrar->getSections() as $slug => $section) {
$tabName = ($prefix) ? $ID.'-'.$slug : $slug;
$class = ($i == 0) ? ' active' : '';
--
Gitblit v1.10.0