Ticket #1430 - Mature-audience content filter (PG, PG13, R): Reviews.

modules/boonex/reviews/classes/BxReviewsConfig.php

@@ -44,6 +44,7 @@ class BxReviewsConfig extends BxBaseModTextConfig
             'FIELD_CATEGORY' => 'cat',
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+            'FIELD_CF' => 'cf',
             'FIELD_REVIEWED_PROFILE' => 'reviewed_profile',
             'FIELD_COVER' => 'covers',
             'FIELD_PHOTO' => 'pictures',
@@ -207,6 +208,7 @@ class BxReviewsConfig extends BxBaseModTextConfig
             	'filter_item_hidden' => '_bx_reviews_grid_filter_item_title_adm_hidden',
                 'filter_item_pending' => '_bx_reviews_grid_filter_item_title_adm_pending',
             	'filter_item_select_one_filter1' => '_bx_reviews_grid_filter_item_title_adm_select_one_filter1',
+                'filter_item_select_one_filter2' => '_bx_reviews_grid_filter_item_title_adm_select_one_filter2',
             	'menu_item_manage_my' => '_bx_reviews_menu_item_title_manage_my',
             	'menu_item_manage_all' => '_bx_reviews_menu_item_title_manage_all',
                 'txt_all_entries_by' => '_bx_reviews_txt_all_entries_by',

modules/boonex/reviews/install/langs/en.xml

@@ -242,7 +242,7 @@
     <string name="_bx_reviews_menu_item_title_view_entries_in_context"><![CDATA[Reviews]]></string>
     <string name="_bx_reviews_menu_title_entries_my"><![CDATA[My Reviews Action Menu]]></string>
     <string name="_bx_reviews_menu_set_title_entries_my"><![CDATA[My Reviews Menu]]></string>
-	<string name="_bx_reviews_menu_item_title_system_manage_my_reviews"><![CDATA[My reviews]]></string>
+    <string name="_bx_reviews_menu_item_title_system_manage_my_reviews"><![CDATA[My reviews]]></string>
     <string name="_bx_reviews_menu_item_title_manage_my_reviews"><![CDATA[Reviews]]></string>
     <string name="_bx_reviews_menu_set_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
     <string name="_bx_reviews_menu_title_manage_tools"><![CDATA[Manage Tools Submenu]]></string>
@@ -254,6 +254,7 @@
     <string name="_bx_reviews_menu_item_title_manage_all"><![CDATA[All Reviews]]></string>
 
     <string name="_bx_reviews_grid_filter_item_title_adm_select_one_filter1"><![CDATA[All Statuses]]></string>
+    <string name="_bx_reviews_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Any Audience]]></string>
     <string name="_bx_reviews_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_reviews_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_reviews_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>

modules/boonex/reviews/install/sql/install.sql

@@ -27,6 +27,7 @@ CREATE TABLE IF NOT EXISTS `bx_reviews_reviews` (
   `comments` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
   `featured` int(11) NOT NULL default '0',
+  `cf` int(11) NOT NULL default '1',
   `allow_view_to` varchar(16) NOT NULL DEFAULT '3',
   `reviewed_profile` int(11) NOT NULL DEFAULT '0',
   `product` varchar(255) NOT NULL,
@@ -439,6 +440,7 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 ('bx_reviews', 'bx_reviews_entry_view', 'bx_reviews', 1, '_bx_reviews_form_entry_display_view');
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
+('bx_reviews', 'bx_reviews', 'cf', '', '#!sys_content_filter', 0, 'select', '_sys_form_entry_input_sys_cf', '_sys_form_entry_input_cf', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
 ('bx_reviews', 'bx_reviews', 'allow_view_to', '', '', 0, 'custom', '_bx_reviews_form_entry_input_sys_allow_view_to', '_bx_reviews_form_entry_input_allow_view_to', '', 1, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
 ('bx_reviews', 'bx_reviews', 'delete_confirm', 1, '', 0, 'checkbox', '_bx_reviews_form_entry_input_sys_delete_confirm', '_bx_reviews_form_entry_input_delete_confirm', '_bx_reviews_form_entry_input_delete_confirm_info', 1, 0, 0, '', '', '', 'Avail', '', '_bx_reviews_form_entry_input_delete_confirm_error', '', '', 1, 0),
 ('bx_reviews', 'bx_reviews', 'do_submit', '_bx_reviews_form_entry_input_do_submit', '', 0, 'submit', '_bx_reviews_form_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
@@ -478,9 +480,10 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_reviews_entry_add', 'polls', 2147483647, 1, 11),
 ('bx_reviews_entry_add', 'covers', 2147483647, 1, 12),
 ('bx_reviews_entry_add', 'allow_view_to', 2147483647, 1, 13),
-('bx_reviews_entry_add', 'location', 2147483647, 0, 14),
-('bx_reviews_entry_add', 'allow_comments', 192, 0, 15),
-('bx_reviews_entry_add', 'do_submit', 2147483647, 1, 20),
+('bx_reviews_entry_add', 'cf', 2147483647, 1, 14),
+('bx_reviews_entry_add', 'location', 2147483647, 0, 15),
+('bx_reviews_entry_add', 'allow_comments', 192, 0, 16),
+('bx_reviews_entry_add', 'do_submit', 2147483647, 1, 17),
 
 ('bx_reviews_entry_delete', 'delete_confirm', 2147483647, 1, 1),
 ('bx_reviews_entry_delete', 'do_submit', 2147483647, 1, 2),
@@ -498,8 +501,9 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_reviews_entry_edit', 'polls', 2147483647, 1, 11),
 ('bx_reviews_entry_edit', 'covers', 2147483647, 1, 12),
 ('bx_reviews_entry_edit', 'allow_view_to', 2147483647, 1, 13),
-('bx_reviews_entry_edit', 'location', 2147483647, 0, 14),
-('bx_reviews_entry_edit', 'allow_comments', 192, 0, 15),
+('bx_reviews_entry_edit', 'cf', 2147483647, 1, 14),
+('bx_reviews_entry_edit', 'location', 2147483647, 0, 15),
+('bx_reviews_entry_edit', 'allow_comments', 192, 0, 16),
 ('bx_reviews_entry_edit', 'do_submit', 2147483647, 1, 17),
 
 ('bx_reviews_entry_view', 'cat', 2147483647, 1, 1),

modules/boonex/reviews/js/manage_tools.js

@@ -8,49 +8,14 @@
  * @{
  */
 
-function BxReviewsManageTools(oOptions) {
-	this._iSearchTimeoutId = false;
-	this._sActionsUrl = oOptions.sActionUrl;
-	this._sObjNameGrid = oOptions.sObjNameGrid;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxReviewsManageTools' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'fade' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-    this._sParamsDivider = oOptions.sParamsDivider == undefined ? '#-#' : oOptions.sParamsDivider;
+function BxReviewsManageTools(oOptions)
+{
+    BxBaseModTextManageTools.call(this, oOptions);
 
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxReviewsManageTools' : oOptions.sObjName;
 }
 
-BxReviewsManageTools.prototype.onChangeFilter = function(oFilter) {
-	var $this = this;
-	var oFilter1 = $('#bx-grid-filter1-' + this._sObjNameGrid);
-	var sValueFilter1 = oFilter1.length > 0 ? oFilter1.val() : '';
-
-	var oSearch = $('#bx-grid-search-' + this._sObjNameGrid);
-	var sValueSearch = oSearch.length > 0 ? oSearch.val() : '';
-	if(sValueSearch == _t('_sys_grid_search'))
-		sValueSearch = '';
-
-	clearTimeout($this._iSearchTimeoutId);
-    $this._iSearchTimeoutId = setTimeout(function () {
-        glGrids[$this._sObjNameGrid].setFilter(sValueFilter1 + $this._sParamsDivider + sValueSearch, true);
-    }, 500);
-};
-
-BxReviewsManageTools.prototype.onClickSettings = function(sMenuObject, oButton) {
-	if($(oButton).hasClass('bx-btn-disabled'))
-		return false;
-
-	bx_menu_popup(sMenuObject, oButton, {}, {
-		content_id: $(oButton).attr('bx_grid_action_data')
-	});
-};
-
-BxReviewsManageTools.prototype.onClickDelete = function(iContentId) {
-	$('.bx-popup-applied:visible').dolPopupHide();
-
-	glGrids[this._sObjNameGrid].actionWithId(iContentId, 'delete', {}, '', false, 1);
-};
+BxReviewsManageTools.prototype = Object.create(BxBaseModTextManageTools.prototype);
+BxReviewsManageTools.prototype.constructor = BxReviewsManageTools;
 
 /** @} */

modules/boonex/russian/data/langs/bx_reviews/ru.xml

@@ -254,6 +254,7 @@
     <string name="_bx_reviews_menu_item_title_manage_all"><![CDATA[Все отзывы]]></string>
 
     <string name="_bx_reviews_grid_filter_item_title_adm_select_one_filter1"><![CDATA[Все статусы]]></string>
+    <string name="_bx_reviews_grid_filter_item_title_adm_select_one_filter2"><![CDATA[Любая аудитория]]></string>
     <string name="_bx_reviews_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_reviews_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_reviews_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>