From d91dbb02037b91cd0bbb70d4311eef79d0f498f2 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 19 Oct 2017 15:18:20 -0400 Subject: [PATCH] rolling back database changes, changing the model action names changing the fields action to entity, adjusting database table column names and datatypes --- classes/data/dataCustomFields.php | 2 +- models/admin/{fields => entity}/fields.php | 12 ++++++------ setup/adminHooks.php | 5 +++-- setup/databaseScripts/create_database_V0.0.4.sql | 6 +++--- setup/databaseScripts/update_database_V0.0.4.sql | 4 ++-- setup/validActions.php | 2 +- views/admin/{fields => entity}/fields.html | 0 7 files changed, 16 insertions(+), 15 deletions(-) rename models/admin/{fields => entity}/fields.php (94%) rename views/admin/{fields => entity}/fields.html (100%) diff --git a/classes/data/dataCustomFields.php b/classes/data/dataCustomFields.php index d6cc38b..f70c2b8 100644 --- a/classes/data/dataCustomFields.php +++ b/classes/data/dataCustomFields.php @@ -139,7 +139,7 @@ class GlmDataFieldsCustomFields extends GlmDataAbstract // group id 'uid' => array ( 'field' => 'uid', - 'type' => 'integer', + 'type' => 'text', 'view_only' => false, 'use' => 'a' ), diff --git a/models/admin/fields/fields.php b/models/admin/entity/fields.php similarity index 94% rename from models/admin/fields/fields.php rename to models/admin/entity/fields.php index df98639..545f19a 100644 --- a/models/admin/fields/fields.php +++ b/models/admin/entity/fields.php @@ -28,7 +28,7 @@ require_once GLM_MEMBERS_FIELDS_PLUGIN_CLASS_PATH.'/data/dataCustomFields.php'; * @release SVN: $Id: packaging.php,v 1.0 2011/01/25 19:31:47 cscott * Exp $ */ -class GlmMembersAdmin_fields_fields extends GlmDataFieldsCustomFields +class GlmMembersAdmin_entity_fields extends GlmDataFieldsCustomFields { /** @@ -96,7 +96,6 @@ class GlmMembersAdmin_fields_fields extends GlmDataFieldsCustomFields */ public function __construct ($wpdb, $config) { - // Save WordPress Database object $this->wpdb = $wpdb; @@ -131,10 +130,11 @@ class GlmMembersAdmin_fields_fields extends GlmDataFieldsCustomFields if (isset($_REQUEST['id'])) { $id = $_REQUEST['id']-0; } - $memberId = 0; + $memberId = 0; if (isset($actionData)) { - $memberId = $actionData-0; - } + $memberId = $actionData; + print_r($actionData); + } switch ($option) { @@ -169,7 +169,7 @@ class GlmMembersAdmin_fields_fields extends GlmDataFieldsCustomFields 'status' => true, 'menuItemRedirect' => false, 'modelRedirect' => false, - 'view' => 'admin/fields/fields.html', + 'view' => 'admin/entity/fields.html', 'data' => $template_data ); diff --git a/setup/adminHooks.php b/setup/adminHooks.php index 2cd50b8..dda3f48 100644 --- a/setup/adminHooks.php +++ b/setup/adminHooks.php @@ -42,9 +42,10 @@ add_filter( 'glm-members-customfields-edit', function( $content, $uid ){ /** * Filter returns the html for the form segment */ -add_filter( 'glm-members-customfields-form', function( $content, $uid, $id ){ +add_filter( 'glm-members-custom-fields-form', function( $content, $uid, $id ){ unset( $_REQUEST['glm_action'] ); - $content = $this->controller( 'fields', 'fields', array( 'uid' => $uid, 'memberId' => $id ), true ); + // $content = $this->controller( 'entity', 'fields', array( 'uid' => false, 'memberId' => false ), true ); + $content = $this->controller( 'entity', 'fields', array('uid'=>$uid, "memberId"=>$id), true ); return $content; }, 10, 3 ); /** diff --git a/setup/databaseScripts/create_database_V0.0.4.sql b/setup/databaseScripts/create_database_V0.0.4.sql index 75a0f58..c98235f 100644 --- a/setup/databaseScripts/create_database_V0.0.4.sql +++ b/setup/databaseScripts/create_database_V0.0.4.sql @@ -20,8 +20,8 @@ CREATE TABLE {prefix}custom_fields ( field_order SMALLINT NOT NULL DEFAULT 0, -- Order for Field admin_search BOOLEAN NOT NULL DEFAULT '0', -- If the field is added to member list filters. required BOOLEAN NOT NULL DEFAULT '0', -- If the field is required. - uid INT NOT NULL, -- id for the series of custom fields associated with an entity - entity_id INT NOT NULL DEFAULT '0', -- id for the specific field associated with an entity + uid TINYTEXT NOT NULL, -- id for the series of custom fields associated with an entity + entity_id INT NOT NULL DEFAULT 0, -- id for the specific field associated with an entity PRIMARY KEY (id), INDEX(field_name(20)) ); @@ -34,7 +34,7 @@ CREATE TABLE {prefix}custom_field_data ( field_id INT NOT NULL DEFAULT 0, -- Field Id ref_dest INT NOT NULL DEFAULT 0, -- Member Info Id field_data TEXT NOT NULL DEFAULT '', -- Data for the field - entity_id INT NOT NULL, -- id for the specific field associated with an entity + entity_id INT NOT NULL DEFAULT 0, -- id for the specific field associated with an entity PRIMARY KEY (id), INDEX(field_id), INDEX(ref_dest) diff --git a/setup/databaseScripts/update_database_V0.0.4.sql b/setup/databaseScripts/update_database_V0.0.4.sql index 122845d..d32183d 100644 --- a/setup/databaseScripts/update_database_V0.0.4.sql +++ b/setup/databaseScripts/update_database_V0.0.4.sql @@ -10,7 +10,7 @@ ALTER TABLE {prefix}custom_fields ADD COLUMN required BOOLEAN DEFAULT '0'; ---- -ALTER TABLE {prefix}custom_fields ADD COLUMN uid INT NOT NULL; +ALTER TABLE {prefix}custom_fields ADD COLUMN uid TINYTEXT NOT NULL DEFAULT ''; ---- @@ -18,4 +18,4 @@ ALTER TABLE {prefix}custom_field_data ADD COLUMN entity_id INT NOT NULL; ---- -ALTER TABLE {prefix}custom_fields ADD COLUMN entity_id INT NOT NULL DEFAULT '0'; +ALTER TABLE {prefix}custom_fields ADD COLUMN entity_id INT NOT NULL DEFAULT 0; diff --git a/setup/validActions.php b/setup/validActions.php index ee086cf..db6208d 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -62,7 +62,7 @@ $glmMembersFieldsAddOnValidActions = array( 'ajax' => array( 'filterSearch' => GLM_MEMBERS_FIELDS_PLUGIN_SLUG, ), - 'fields' => array( + 'entity' => array( 'fields' => GLM_MEMBERS_FIELDS_PLUGIN_SLUG, ), 'management' => array( diff --git a/views/admin/fields/fields.html b/views/admin/entity/fields.html similarity index 100% rename from views/admin/fields/fields.html rename to views/admin/entity/fields.html -- 2.17.1