feat(ModComments) set default block status and criteria via global va…

…riables
tsolucio · Aug 27, 2016 · 5f996fd · 5f996fd
1 parent 52d0227
commit 5f996fd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/Smarty/templates/modules/ModComments/widgets/DetailViewBlockComment.tpl b/Smarty/templates/modules/ModComments/widgets/DetailViewBlockComment.tpl
@@ -13,7 +13,13 @@
 <td colspan="4" class="dvInnerHeader">
 	<div style="float: left; font-weight: bold;">
 	<div style="float: left;">
-	<a href="javascript:showHideStatus('tbl{$UIKEY}','aid{$UIKEY}','$IMAGE_PATH');"><span class="exp_coll_block inactivate"><img id="aid{$UIKEY}" src="{'activate.gif'|@vtiger_imageurl:$THEME}" style="border: 0px solid rgb(0, 0, 0);" alt="{'LBL_Hide'|@getTranslatedString:'Settings'}" title="{'LBL_Hide'|@getTranslatedString:'Settings'}"></span></a>
+	<a href="javascript:showHideStatus('tbl{$UIKEY}','aid{$UIKEY}','$IMAGE_PATH');">
+	{if $BLOCKOPEN}
+	<span class="exp_coll_block inactivate"><img id="aid{$UIKEY}" src="{'activate.gif'|@vtiger_imageurl:$THEME}" style="border: 0px solid rgb(0, 0, 0);" alt="{'LBL_Hide'|@getTranslatedString:'Settings'}" title="{'LBL_Hide'|@getTranslatedString:'Settings'}"></span></a>
+	{else}
+	<span class="exp_coll_block activate"><img id="aid{$UIKEY}" src="{'inactivate.gif'|@vtiger_imageurl:$THEME}" style="border: 0px solid rgb(0, 0, 0);" alt="{'LBL_Show'|@getTranslatedString:'Settings'}" title="{'LBL_Show'|@getTranslatedString:'Settings'}">
+	{/if}
+	</span></a>
 	</div><b>&nbsp;{$WIDGET_TITLE}</b></div>
 	<span style="float: right;">
 		<img src="{'vtbusy.gif'|@vtiger_imageurl:$THEME}" border=0 id="indicator{$UIKEY}" style="display:none;">
@@ -28,7 +34,7 @@
 </table>
 {/if}
 
-<div id="tbl{$UIKEY}" style="display: block">
+<div id="tbl{$UIKEY}" style="display: {if $BLOCKOPEN}block{else}none{/if};">
 	<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr style="height: 25px;">
 		<td colspan="4" align="left" class="dvtCellInfo commentCell">

diff --git a/build/changeSets/DefineGlobalVariables.php b/build/changeSets/DefineGlobalVariables.php
@@ -74,6 +74,8 @@ function applyChange() {
 				'Product_Maximum_Number_Images',
 				'Workflow_Send_Email_ToCCBCC',
 				'Workflow_GeoDistance_Country_Default',
+				'ModComments_DefaultCriteria',
+				'ModComments_DefaultBlockStatus',
 
 				'Report_Send_Scheduled_ifEmpty',
 

diff --git a/modules/GlobalVariable/language/en_us.gvdefs.php b/modules/GlobalVariable/language/en_us.gvdefs.php
@@ -76,6 +76,20 @@
 	'values' => '0 | 1',
 	'definition' => 'If set to 1, which is the default value, you will not be able to duplicate account names, if set to 0 that will be permitted.',
 ),
+'ModComments_DefaultBlockStatus' => array(
+	'status' => 'Implemented',
+	'valuetype' => 'Boolean',
+	'category' => 'Module Functionality',
+	'values' => '0 | 1',
+	'definition' => 'If set to 1, which is the default value, the Comments block will be open, if set to 0 it will be closed.',
+),
+'ModComments_DefaultCriteria' => array(
+	'status' => 'Implemented',
+	'valuetype' => 'String',
+	'category' => 'Module Functionality',
+	'values' => 'All | Last5 | Mine',
+	'definition' => '"All" (default value) will show all comments related to the module, "Last5" will show only the last 5 commentas and "Mine" will show all comments of the current user.',
+),
 'Debug_Send_VtigerCron_Error' => array(
 	'status' => 'Implemented',
 	'valuetype' => 'CSV EMail',

diff --git a/modules/ModComments/widgets/DetailViewBlockComment.php b/modules/ModComments/widgets/DetailViewBlockComment.php
@@ -18,6 +18,7 @@ class ModComments_DetailViewBlockCommentWidget {
 	protected $criteria= false;
 
 	function __construct() {
+		$this->defaultCriteria = GlobalVariable::getVariable('ModComments_DefaultCriteria',$this->defaultCriteria);
 	}
 
 	function getFromContext($key, $purify=false) {
@@ -105,6 +106,8 @@ function process($context = false) {
 		$viewer = $this->getViewer();
 		$viewer->assign('ID', $sourceRecordId);
 		$viewer->assign('CRITERIA', $usecriteria);
+		$BLOCKOPEN = GlobalVariable::getVariable('ModComments_DefaultBlockStatus',1);
+		$viewer->assign('BLOCKOPEN', $BLOCKOPEN);
 		list($void,$canaddcomments) = cbEventHandler::do_filter('corebos.filter.ModComments.canAdd', array($sourceRecordId, true));
 		$viewer->assign('CANADDCOMMENTS', ($canaddcomments ? 'YES' : 'NO'));
 		$viewer->assign('COMMENTS', $this->getModels($sourceRecordId, $usecriteria) );