From bb74b29524e82802f1910ee77b08e0538698acd4 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 21 Feb 2018 14:55:39 -0500 Subject: [PATCH] Add new flag for member event moderated If checked then all member events are moderated. --- classes/data/dataManagement.php | 6 ++++++ index.php | 2 +- models/admin/events/list.php | 4 ++++ setup/databaseScripts/0.1.5-steve | 0 ..._database_V0.1.4.sql => create_database_V0.1.5.sql} | 1 + setup/databaseScripts/dbVersions.php | 1 + setup/databaseScripts/update_database_V0.1.5.sql | 10 ++++++++++ views/admin/management/events.html | 10 ++++++++-- 8 files changed, 31 insertions(+), 3 deletions(-) delete mode 100644 setup/databaseScripts/0.1.5-steve rename setup/databaseScripts/{create_database_V0.1.4.sql => create_database_V0.1.5.sql} (99%) create mode 100644 setup/databaseScripts/update_database_V0.1.5.sql diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index 91200a6..c563c97 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -214,6 +214,12 @@ class GlmDataEventsManagement extends GlmDataAbstract 'default' => false, 'use' => 'a' ), + 'member_events_moderated' => array( + 'field' => 'member_events_moderated', + 'type' => 'checkbox', + 'default' => false, + 'use' => 'a' + ), ); diff --git a/index.php b/index.php index e6c256c..14edc6b 100644 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ if (!defined('ABSPATH')) { * version from this plugin. */ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.6.76'); -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.4'); +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.5'); // This is the minimum version of the GLM Members DB plugin require for this plugin. define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.9.15'); diff --git a/models/admin/events/list.php b/models/admin/events/list.php index 01f0ae8..5cfd116 100644 --- a/models/admin/events/list.php +++ b/models/admin/events/list.php @@ -151,6 +151,10 @@ class GlmMembersAdmin_events_list extends GlmDataEvents $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); if ($lockedToMember) { $isModerated = apply_filters('glm_user_is_moderated', $lockedToMember); + // Also need to check if the setting for member event moderated is on + if ( $this->config['settings']['member_events_moderated'] ) { + $isModerated = true; + } $memberID = $lockedToMember; $this->fields['admin_name']['required'] = true; $this->fields['admin_email']['required'] = true; diff --git a/setup/databaseScripts/0.1.5-steve b/setup/databaseScripts/0.1.5-steve deleted file mode 100644 index e69de29..0000000 diff --git a/setup/databaseScripts/create_database_V0.1.4.sql b/setup/databaseScripts/create_database_V0.1.5.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.1.4.sql rename to setup/databaseScripts/create_database_V0.1.5.sql index 3686fba..0cce7f6 100644 --- a/setup/databaseScripts/create_database_V0.1.4.sql +++ b/setup/databaseScripts/create_database_V0.1.5.sql @@ -228,6 +228,7 @@ CREATE TABLE {prefix}management ( use_event_amenities BOOLEAN NULL, -- Whether amenities are used at all for events use_venue_locations BOOLEAN NULL, -- To use Other members as the location of event member_events_allowed BOOLEAN NULL, -- If members are allowed to add events. + member_events_moderated BOOLEAN DEFAULT '0', -- If member edits are moderated. PRIMARY KEY (id) ); diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index f8fbd2b..f4e702f 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -40,5 +40,6 @@ $glmMembersEventsDbVersions = array( '0.1.2' => array('version' => '0.1.2', 'tables' => 12, 'date' => '05/03/2017'), '0.1.3' => array('version' => '0.1.3', 'tables' => 13, 'date' => '08/14/2017'), '0.1.4' => array('version' => '0.1.4', 'tables' => 13, 'date' => '08/18/2017'), + '0.1.5' => array('version' => '0.1.5', 'tables' => 13, 'date' => '02/21/2018'), ); diff --git a/setup/databaseScripts/update_database_V0.1.5.sql b/setup/databaseScripts/update_database_V0.1.5.sql new file mode 100644 index 0000000..0bc18af --- /dev/null +++ b/setup/databaseScripts/update_database_V0.1.5.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database - Events Add-On +-- File Created: 02/21/18 +-- Database Version: 0.1.5 +-- Database Update From Previous Version Script +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes + +-- new field in management +ALTER TABLE {prefix}management ADD COLUMN member_events_moderated BOOLEAN DEFAULT '0'; -- If members edits are moderated diff --git a/views/admin/management/events.html b/views/admin/management/events.html index 42555f8..236ca7b 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -26,9 +26,15 @@ - + + + + + -- 2.17.1
Members{$terms.term_member_plur_cap} -

+

+
  +