From 48721c85ebcfa973ee81719d2467ca80e4253dc9 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 01 May 2026 17:30:03 +0000
Subject: [PATCH] =Edmonton Ink hard test begins! Real testing of the managers and reset routes will commence. So far, just ensuring our classes are all loaded correctly: Site() and its sub-classes Membership, Login, etc. Care should be taken to load conditionally on 'init', as we finish defining most settings by 'plugins_loaded' at priority 5
---
inc/meta/Form.php | 121 +++++++++++++++++++++------------------
1 files changed, 65 insertions(+), 56 deletions(-)
diff --git a/inc/meta/Form.php b/inc/meta/Form.php
index d011d4e..0af4d26 100644
--- a/inc/meta/Form.php
+++ b/inc/meta/Form.php
@@ -2,6 +2,7 @@
namespace JVBase\meta;
use DateTime;
+use JVBase\registrar\Registrar;
if (!defined('ABSPATH')) {
exit;
@@ -674,16 +675,9 @@
$content = $config['content'];
$config['data']['content'] = $content;
- $plural =
- JVB_CONTENT[$content]['plural']
- ?? JVB_TAXONOMY[$content]['plural']
- ?? JVB_USER[$content]['plural']
- ?? str_replace('_', ' ', $content) . 's';
-
- $singular = JVB_CONTENT[$content]['singular']
- ?? JVB_TAXONOMY[$content]['singular']
- ?? JVB_USER[$content]['singular']
- ?? str_replace('_', ' ',$config['content']);
+ $registrar = Registrar::getInstance($content);
+ $plural = $registrar->getPlural()??str_replace('_', ' ', $content).'s';
+ $singular = $registrar->getSingular()??str_replace('_', ' ', $content);
}
if ($config['limit'] > 0) {
$config['data']['max-files'] = $config['limit'];
@@ -745,6 +739,13 @@
}
$input .= '</div>'; // closes .file-upload-container
+
+ $input .= sprintf(
+ '<input type="hidden" name="%s" value="%s">',
+ esc_attr($name),
+ esc_attr(!empty($attachmentIds) ? implode(',', $attachmentIds) : '')
+ );
+
unset($config['description']);
unset($config['label']);
return static::fieldWrap($name, $input, $config);
@@ -1178,18 +1179,20 @@
'type' => $config['subtype'],
], $config);
- $icon = match ($config['subtype']) {
- 'taxonomy' => JVB_TAXONOMY[$config['taxonomy']]['icon'] ?? jvbDefaultIcon(),
- 'content' => JVB_CONTENT[$config['content']]['icon'] ?? jvbDefaultIcon(),
- 'user' => JVB_USER[$config['role']]['icon'] ?? 'user',
- default => jvbDefaultIcon(),
- };
+ $registrar = Registrar::getInstance($config[$config['subtype']]);
+ $icon = jvbDefaultIcon();
+ if ($registrar){
+ $icon = $registrar->getIcon()??jvbDefaultIcon();
+ }
$containerId = sprintf('%s-%s-selector', $name, $config['subtype']);
$input = sprintf(
'<div class="row btw">
- <label for="%s-autocomplete">%s<span>%s</span></label>',
+ <input type="hidden" name="%s" value="%s">
+ <label for="%s-autocomplete">%s<span>%s</span></label>',
+ esc_attr($name),
+ esc_attr(!empty($ids) ? implode(',', $ids) : ''),
esc_attr($name),
jvbIcon($icon),
esc_html($config['label']),
@@ -1202,59 +1205,64 @@
}
$plural = static::getPlural($config);
$input .= sprintf(
- '<div class="selected-item row" role="region" aria-label="Selected %s"></div>',
+ '<div class="selected-items row" role="region" aria-label="Selected %s"></div>',
$plural[1]??''
);
+ $input .= '</div>'; //Close the first div.row.btw
+
$config['type'] = 'selector';
unset($config['label']);
unset($config['description']);
unset($config['hint']);
$config['skipInput'] = true;
- return static::fieldWrap($containerId, $input, $config);
+ return static::fieldWrap($name, $input, $config);
}
protected static function getPlural(array $config):array
{
+ $single = $plural = '';
switch ($config['subtype']) {
case 'taxonomy':
- if (array_key_exists($config['taxonomy'], JVB_TAXONOMY)) {
- $single = JVB_TAXONOMY[$config['taxonomy']]['singular'];
- $plural = JVB_TAXONOMY[$config['taxonomy']]['plural'];
+ $registrar = Registrar::getInstance($config['taxonomy']);
+ if ($registrar) {
+ $single = $registrar->getSingular();
+ $plural = $registrar->getPlural();
} else {
$taxonomy = get_taxonomy($config['taxonomy']);
- if (!$taxonomy) {
- return [];
+ if ($taxonomy) {
+ $single = $taxonomy->labels->singular_name;
+ $plural = $taxonomy->labels->name;
}
- $single = $taxonomy->labels->singular_name;
- $plural = $taxonomy->labels->name;
}
break;
case 'content':
- if (array_key_exists($config['content'], JVB_CONTENT)) {
- $single = JVB_CONTENT[$config['content']]['singular'];
- $plural = JVB_CONTENT[$config['content']]['plural'];
+ $registrar = Registrar::getInstance($config['content']);
+ if ($registrar) {
+ $single = $registrar->getSingular();
+ $plural = $registrar->getPlural();
} else {
$postType = get_post_type_object($config['content']);
- if (!$postType) {
- return '';
+ if ($postType) {
+ $single = $postType->labels->singular_name;
+ $plural = $postType->labels->name;
}
- $single = $postType->labels->singular_name;
- $plural = $postType->labels->name;
+
}
break;
case 'user':
- if (array_key_exists($config['user'], JVB_USER)) {
- $single = JVB_USER[$config['user']]['singular'];
- $plural = JVB_USER[$config['user']]['plural'];
+ $registrar = Registrar::getInstance($config['user']);
+
+ if ($registrar) {
+ $single = $registrar->getSingular();
+ $plural = $registrar->getPlural();
} else {
$user = get_role($config['user']);
- if (!$user) {
- return '';
+ if ($user) {
+ $single = 'User';
+ $plural = 'Users';
}
- $single = 'User';
- $plural = 'Users';
}
break;
}
@@ -1265,9 +1273,10 @@
{
switch ($config['subtype']) {
case 'taxonomy':
- if (array_key_exists($config['taxonomy'], JVB_TAXONOMY)) {
- $single = JVB_TAXONOMY[$config['taxonomy']]['singular'];
- $plural = JVB_TAXONOMY[$config['taxonomy']]['plural'];
+ $registrar = Registrar::getInstance($config['taxonomy']);
+ if ($registrar) {
+ $single = $registrar->getSingular();
+ $plural = $registrar->getPlural();
} else {
$taxonomy = get_taxonomy($config['taxonomy']);
if (!$taxonomy) {
@@ -1284,9 +1293,10 @@
);
break;
case 'content':
- if (array_key_exists($config['content'], JVB_CONTENT)) {
- $single = JVB_CONTENT[$config['content']]['singular'];
- $plural = JVB_CONTENT[$config['content']]['plural'];
+ $registrar = Registrar::getInstance($config['content']);
+ if ($registrar) {
+ $single = $registrar->getSingular();
+ $plural = $registrar->getPlural();
} else {
$postType = get_post_type_object($config['content']);
if (!$postType) {
@@ -1304,9 +1314,10 @@
break;
case 'user':
- if (array_key_exists($config['user'], JVB_USER)) {
- $single = JVB_USER[$config['user']]['singular'];
- $plural = JVB_USER[$config['user']]['plural'];
+ $registrar = Registrar::getInstance($config['user']);
+ if ($registrar){
+ $single = $registrar->getSingular();
+ $plural = $registrar->getPlural();
} else {
$user = get_role($config['user']);
if (!$user) {
@@ -1344,7 +1355,7 @@
$dataAttrs[] = 'data-selected="'.esc_attr(implode(',',$selected)).'"';
}
if ($config['autocomplete']) {
- $dataAttrs[] = 'autocomplete';
+ $dataAttrs[] = 'data-autocomplete';
}
if (array_key_exists('hidden', $config) && $config['hidden']) {
$dataAttrs[] = 'hidden';
@@ -1363,13 +1374,10 @@
}
protected static function buildSelectorAutocomplete(string $name, array $config): string
{
- $containerId = sprintf('%s-%s-selector', $name, $config['subtype'] ?? $config['type']);
return sprintf(
- '<input type="hidden" name="%s" value="">
- <input type="search" id="%s-autocomplete" autocomplete="off" data-ignore data-autocomplete>
+ '<input type="search" id="%s-autocomplete" autocomplete="off" data-ignore data-autocomplete>
<p class="message" hidden aria-live="polite">{ <span>Loading items</span> }</p>
<div class="auto-wrapper" hidden><ul class="search-results"></ul><button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button></div>',
- esc_attr($containerId),
esc_attr($name)
);
}
@@ -1589,8 +1597,8 @@
{
$fields = $config['fields'] ?? [];
$rows = is_array($value) ? $value : [];
- if(array_key_exists('row_label', $config)) {
- $config['data']['label'] = esc_attr($config['row_label']);
+ if(array_key_exists('add_label', $config)) {
+ $config['data']['label'] = esc_attr($config['add_label']);
}
$input = sprintf(
@@ -1617,6 +1625,7 @@
array_key_exists('add_label', $config) ? $config['add_label'] : 'Add Item'
);
+ unset($config['label']);
return static::fieldWrap($name, $input, $config);
}
protected static function renderRepeaterRow(array $fields, array $values, int|string $index, string $name, string $rowTitle='New Item'):string
--
Gitblit v1.10.0