From bfb335f7c33796c776f906390b83fb289980e854 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Wed, 16 Nov 2022 14:10:34 -0700
Subject: [PATCH] * Resources: Customfields can now be per category

---
 admin/inc/class.admin_customfields.inc.php    | 16 +++--
 admin/templates/default/customfields.xet      | 55 ++++++++---------
 .../inc/class.resources_customfields.inc.php  | 59 +++++++++++++++++++
 resources/inc/class.resources_hooks.inc.php   | 26 ++++----
 resources/templates/default/admin.types.xet   | 18 ++++++
 resources/templates/default/edit.xet          | 22 +++----
 6 files changed, 139 insertions(+), 57 deletions(-)
 create mode 100644 resources/inc/class.resources_customfields.inc.php
 create mode 100644 resources/templates/default/admin.types.xet

diff --git a/admin/inc/class.admin_customfields.inc.php b/admin/inc/class.admin_customfields.inc.php
index dc86bd89de..ed82c0140d 100644
--- a/admin/inc/class.admin_customfields.inc.php
+++ b/admin/inc/class.admin_customfields.inc.php
@@ -430,7 +430,10 @@ class admin_customfields
 		$test = new Etemplate();
 		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
-		$this->tmpl = new Etemplate();
+		if(is_null($this->tmpl))
+		{
+			$this->tmpl = new Etemplate();
+		}
 		$this->tmpl->read('admin.customfield_edit');
 
 		Api\Translation::add_app('infolog');	// til we move the translations
@@ -501,13 +504,14 @@ class admin_customfields
 		}
 		$content['statustext'] = $content['options'][$content['cf_type']];
 		$content['attributes'] = self::$type_attribute_flags;
+		$exec = static::class == 'admin_customfields' ? 'admin.admin_customfields.edit' : $this->appname . '.' . static::class . '.edit';
 
-		$this->tmpl->exec('admin.admin_customfields.edit',$content,$sel_options,$readonlys,array(
-			'cf_id' => $cf_id,
-			'cf_app' => $this->appname,
-			'cf_name' => $content['cf_name'],
+		$this->tmpl->exec($exec, $content, $sel_options, $readonlys, array(
+			'cf_id'       => $cf_id,
+			'cf_app'      => $this->appname,
+			'cf_name'     => $content['cf_name'],
 			'use_private' => $this->use_private,
-		),2);
+		),                2);
 	}
 
 	/**
diff --git a/admin/templates/default/customfields.xet b/admin/templates/default/customfields.xet
index 819e362802..82b2dac7a1 100644
--- a/admin/templates/default/customfields.xet
+++ b/admin/templates/default/customfields.xet
@@ -15,13 +15,11 @@
 			<rows>
 				<row>
 					<hbox>
-					<description id="appname"/>
-					<description value=" - "/>
-					<description value="type"/>
+						<description id="appname"/>
+						<description value="-"/>
+						<description value="type"/>
 					</hbox>
-					<menulist>
-						<menupopup id="types" no_lang="1" onchange="1"/>
-					</menulist>
+					<select id="types" no_lang="1" onchange="1"/>
 					<button label="Delete" id="delete" onclick="app.admin.cf_type_delete"/>
 					<textbox blur="new name" id="name"/>
 					<button label="Create" id="create"/>
@@ -60,28 +58,27 @@
 					<nextmatch-sortheader label="Last modified" id="cf_modified"/>
 				</row>
 				<row class="row" valign="top">
-					<menulist>
-						<menupopup id="${row}[cf_type2]" no_lang="1" multiple="true" empty_label="All"/>
-					</menulist>
-					<description id="${row}[cf_name]" no_lang="1" />
-					<vbox>
-						<description id="${row}[cf_label]" no_lang="1"/>
-						<description id="${row}[cf_label]"/>
-					</vbox>
-					<customfields-types statustext="Type of customfield" id="{$row}[cf_type]"/>
-					<checkbox id="${row}[cf_needed]" selected_value="1" unselected_value="0"/>
-					<select-account id="${row}[cf_private]" account_type="both"/>
-					<description id="${row}[cf_values]" no_lang="1" class="values"/>
-					<vbox>
-						<description id="${row}[cf_len]" no_lang="1"/>
-						<description id="${row}[cf_rows]" no_lang="1"/>
-					</vbox>
-					<description id="${row}[cf_order]" no_lang="1"/>
-					<vbox>
-						<date-time id="${row}[cf_modified]"/>
-						<select-account id="${row}[cf_modifier]"/>
-					</vbox>
-				</row>
+                    <select id="${row}[cf_type2]" no_lang="1" multiple="true" empty_label="All" readonly="true"/>
+                    <description id="${row}[cf_name]" no_lang="1"/>
+                    <vbox>
+                        <description id="${row}[cf_label]" no_lang="1"/>
+                        <description id="${row}[cf_label]"/>
+                    </vbox>
+                    <customfields-types statustext="Type of customfield" id="{$row}[cf_type]" readonly="true"
+                                        app="$cont[appname]"/>
+                    <checkbox id="${row}[cf_needed]" selected_value="1" unselected_value="0" readonly="true"/>
+                    <select-account id="${row}[cf_private]" account_type="both" readonly="true"/>
+                    <description id="${row}[cf_values]" no_lang="1" class="values"/>
+                    <vbox>
+                        <description id="${row}[cf_len]" no_lang="1"/>
+                        <description id="${row}[cf_rows]" no_lang="1"/>
+                    </vbox>
+                    <description id="${row}[cf_order]" no_lang="1"/>
+                    <vbox>
+                        <date-time id="${row}[cf_modified]" readonly="true"/>
+                        <select-account id="${row}[cf_modifier]" readonly="true"/>
+                    </vbox>
+                </row>
 			</rows>
 		</grid>
 	</template>
@@ -92,4 +89,4 @@
 		<template id="@type_template"/>
 		<nextmatch id="nm" template="admin.customfields.fields" header_left="admin.customfields.add"/>
 	</template>
-</overlay>
+</overlay>
\ No newline at end of file
diff --git a/resources/inc/class.resources_customfields.inc.php b/resources/inc/class.resources_customfields.inc.php
new file mode 100644
index 0000000000..9bdca1d4d9
--- /dev/null
+++ b/resources/inc/class.resources_customfields.inc.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Resources - Custom fields
+ *
+ * @link http://www.egroupware.org
+ * @author Nathan Gray
+ * @package resources
+ * @copyright (c) 2022 by Nathan Gray
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
+
+use EGroupware\Api;
+use EGroupware\Api\Etemplate;
+use EGroupware\Api\Acl;
+
+/**
+ * Administration of custom fields, type and status
+ *
+ * Extending to use categories as type for custom fields
+ */
+class resources_customfields extends admin_customfields
+{
+	public $appname = 'resources';
+	/**
+	 * Instance of the resources BO class
+	 *
+	 * @var resources_bo
+	 */
+	var $bo;
+
+	function __construct()
+	{
+		parent::__construct('resources');
+
+		$this->bo = new resources_bo();
+		$this->tmpl = new Etemplate();
+
+		// For index - override so "add" button opens correctly
+		$this->tmpl->setElementAttribute("nm", "header_left", "resources.customfields.add");
+
+		$content_types = $this->bo->acl->get_cats(Acl::ADD);
+		array_walk($content_types, function ($name, $id)
+		{
+			$this->content_types[$id] = array('name' => $name);
+		});
+
+		Api\Translation::add_app('resources');
+	}
+
+	public function edit($content = null)
+	{
+		// Turn private off
+		$_GET['use_private'] = false;
+		unset($content['use_private']);
+
+		parent::edit($content);
+	}
+}
diff --git a/resources/inc/class.resources_hooks.inc.php b/resources/inc/class.resources_hooks.inc.php
index ceac6f92d4..f22e91d0ab 100644
--- a/resources/inc/class.resources_hooks.inc.php
+++ b/resources/inc/class.resources_hooks.inc.php
@@ -52,18 +52,22 @@ class resources_hooks
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			$file = Array(
-				'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
-				'Global Categories'  => Egw::link('/index.php',array(
-					'menuaction' => 'admin.admin_categories.index',
-					'appname'    => $appname,
-					'global_cats'=> true,
-					'ajax' => 'true'
+			$file = array(
+				'Site Configuration'           => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=' . $appname . '&ajax=true'),
+				'Global Categories'            => Egw::link('/index.php', array(
+					'menuaction'  => 'admin.admin_categories.index',
+					'appname'     => $appname,
+					'global_cats' => true,
+					'ajax'        => 'true'
 				)),
-				'Configure Access Permissions' => Egw::link('/index.php',
-					'menuaction=resources.resources_acl_ui.index&ajax=true'),
-				'Custom Fields'=>egw::link('/index.php',
-					'menuaction=admin.admin_customfields.index&appname=resources&ajax=true'),
+				'Configure Access Permissions' => Egw::link(
+					'/index.php',
+					'menuaction=resources.resources_acl_ui.index&ajax=true'
+				),
+				'Custom Fields'                => egw::link(
+					'/index.php',
+					'menuaction=resources.resources_customfields.index&appname=resources&ajax=true'
+				),
 			);
 			if ($location == 'admin')
 			{
diff --git a/resources/templates/default/admin.types.xet b/resources/templates/default/admin.types.xet
new file mode 100644
index 0000000000..c0309cfa75
--- /dev/null
+++ b/resources/templates/default/admin.types.xet
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+    <template id="resources.customfields.types">
+    </template>
+    <template id="resources.customfields.add" template="" lang="" group="0" version="1.9.001">
+        <buttononly label="Add" id="add"
+                    onclick="egw.open_link('resources.resources_customfields.edit&amp;appname='+widget.getArrayMgr('content').getRoot().getEntry('nm[appname]'),false,'450x380');"/>
+    </template>
+    <template id="resources.admin.types" template="" lang="" group="0" version="">
+        <template id="resources.customfields.types" content="content_types"/>
+        <styles>.header{
+            font-weight: bold;
+            }
+        </styles>
+    </template>
+</overlay>
diff --git a/resources/templates/default/edit.xet b/resources/templates/default/edit.xet
index c58316fc85..05b302cd2c 100644
--- a/resources/templates/default/edit.xet
+++ b/resources/templates/default/edit.xet
@@ -113,7 +113,7 @@
 					<description value="Custom fields"/>
 				</row>
 				<row valign="top">
-					<customfields/>
+					<customfields type_filter="@cat_id"/>
 				</row>
 			</rows>
 		</grid>
@@ -141,16 +141,16 @@
 					<appicon/>
 					<description/>
 				</row>
-				<row class="dialogHeader2">
-					<description value="Quantity"/>
-					<textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10" class="et2_fullWidth"/>
-					<description/>
-					<description value="Category"/>
-					<menulist span="3">
-						<menupopup align="right" statustext="Which category does this resource belong to?" id="cat_id" needed="1" no_lang="1" class="et2_fullWidth" />
-					</menulist>
-					<description/>
-				</row>
+                <row class="dialogHeader2">
+                    <description value="Quantity"/>
+                    <textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10"
+                             class="et2_fullWidth"/>
+                    <description/>
+                    <description value="Category"/>
+                    <select span="3" tatustext="Which category does this resource belong to?" id="cat_id"
+                            needed="1" no_lang="1" onchange="1" class="et2_fullWidth"/>
+                    <description/>
+                </row>
 				<row class="dialogHeader3">
 					<description value="Useable"/>
 					<textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" class="et2_fullWidth"/>