Merge pull request #168 from techjoomla/release-1.1.4

Release 1.1.4
techjoomla · Nov 11, 2019 · b55d986 · b55d986
2 parents 474b6e7 + 85cd165
commit b55d986
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 17 deletions.
diff --git a/tjreports/plugins/actionlog/tjreports/tjreports.xml b/tjreports/plugins/actionlog/tjreports/tjreports.xml
@@ -2,12 +2,12 @@
 <extension version="3.9" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_tjreports</name>
 	<author>Techjoomla</author>
-	<creationDate>24th Oct 2019</creationDate>
+	<creationDate>11th Nov 2019</creationDate>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<version>1.1.3</version>
+	<version>1.1.4</version>
 	<description>PLG_ACTIONLOG_TJREPORTS_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="tjreports">tjreports.php</filename>

diff --git a/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml b/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml
@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>24th Oct 2019</creationDate>
+	<creationDate>11th Nov 2019</creationDate>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.3</version>
+	<version>1.1.4</version>
 
 	<files>
 		<filename plugin="tjreportsfields">tjreportsfields.php</filename>

diff --git a/tjreports/plugins/privacy/tjreports/tjreports.xml b/tjreports/plugins/privacy/tjreports/tjreports.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_tjreports</name>
-	<version>1.1.3</version>
-	<creationDate>24th Oct 2019</creationDate>
+	<version>1.1.4</version>
+	<creationDate>11th Nov 2019</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>

diff --git a/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml b/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml
@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>24th Oct 2019</creationDate>
+	<creationDate>11th Nov 2019</creationDate>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>1.1.3</version>
+	<version>1.1.4</version>
 	<install>
         <sql>
             <file driver="mysql" charset="utf8">sql/tjreportsindexer.install.sql</file>

diff --git a/tjreports/site/assets/js/tjrContentUI.js b/tjreports/site/assets/js/tjrContentUI.js
@@ -49,7 +49,7 @@ jQuery.extend(tjrContentUI.report, {
 
 				// If sendEmail plug is enabled then try to add a column of checkboxes
 				if (
-				  typeof window.tjSendEmail.UI != 'undefined' &&
+				  typeof window.tjSendEmail != 'undefined' &&
 				  jQuery('body').find('.td-sendemail').length > 0
 				)
 				{

diff --git a/tjreports/site/models/reports.php b/tjreports/site/models/reports.php
@@ -48,7 +48,7 @@ class TjreportsModelReports extends JModelList
 	public $showhideCols = array();
 
 	// Columns which will be displayed by default
-	private $defaultColToShow = array();
+	public $defaultColToShow = array();
 
 	// Columns which will be hide by default
 	private $defaultColToHide = array();
@@ -85,7 +85,10 @@ class TjreportsModelReports extends JModelList
 
 	private $filterPiiColumns = array();
 
-	private $filterParamColToshow = array();
+	public $filterParamColToshow = array();
+
+	// Used to get the columns which are hide by default in load params
+	public $filterDefaultColToHide = array();
 
 	/**
 	 * Constructor.
@@ -1140,7 +1143,7 @@ private function filterReportColumns($queryId, &$selColToshow)
 		}
 
 		$query = $this->_db->getQuery(true);
-		$this->filterShowhideCols = $this->filterPiiColumns = $this->filterParamColToshow = array();
+		$this->filterDefaultColToHide = $this->filterShowhideCols = $this->filterPiiColumns = $this->filterParamColToshow = array();
 
 		// $this->filterSelColToshow = $selColToshow;
 
@@ -1168,6 +1171,12 @@ private function filterReportColumns($queryId, &$selColToshow)
 			}
 		}
 
+		// Used to get the columns which are hide by default in load params
+		if (!empty($this->filterDefaultColToHide))
+		{
+			$this->defaultColToHide = $this->filterDefaultColToHide;
+		}
+
 		if (!empty($this->filterShowhideCols))
 		{
 			$this->showhideCols = $this->filterShowhideCols;
@@ -1240,6 +1249,11 @@ private function processSavedReportColumns($queryId, &$selColToshow)
 					{
 						$this->filterParamColToshow[$cols] = $cols;
 					}
+					else
+					{
+						// Used to get the columns which are hide (false) by default in load params
+						$this->filterDefaultColToHide[$cols] = $cols;
+					}
 
 					if (!empty($param['showHideColumns']) && !in_array($cols, $param['showHideColumns']) && !empty($selColToshow))
 					{
@@ -1253,6 +1267,10 @@ private function processSavedReportColumns($queryId, &$selColToshow)
 			// Check PII permission
 			if (!empty($param['piiColumns']) && !$this->piiPermission)
 			{
+				/* Checked the columns which are hide(false) in load params & if set them as piiColumns
+				* then it only returns the columns which are not available in piiColumns. */
+				$this->filterDefaultColToHide = array_diff($this->filterDefaultColToHide, $param['piiColumns']);
+
 				$this->filterParamColToshow = array_diff($this->filterParamColToshow, $param['piiColumns']);
 				$this->filterShowhideCols = array_diff($this->filterShowhideCols, $param['piiColumns']);
 			}

diff --git a/tjreports/site/views/reports/view.base.php b/tjreports/site/views/reports/view.base.php
@@ -169,17 +169,26 @@ public function processData($type = 'html')
 		 */
 		$this->showHideColumns = $this->model->showhideCols;
 
+		/* To get the columns from loadparams*/
+		$this->defaultColToshow = $this->model->filterParamColToshow;
+
+		/* Check the columns in loadparams are available or not & show plugin level columns & custom field columns
+		 * in case if load params are not available*/
+		if (empty($this->defaultColToshow))
+		{
+			$this->defaultColToshow = $this->model->defaultColToShow;
+		}
+
 		if (!empty($this->defaultColToHide))
 		{
-			$this->showHideColumns = array_intersect($this->model->showhideCols, array_merge($this->model->getState('colToshow'), $this->defaultColToHide));
+			$this->showHideColumns = array_intersect($this->model->showhideCols, array_merge($this->defaultColToshow, $this->defaultColToHide));
 		}
 
 		$this->sortable        = $this->model->sortableColumns;
 		$this->emailColumn     = $this->model->getState('emailColumn');
 		$this->srButton        = $this->model->showSearchResetButton;
 
-		// Array_intersect - if column present in colToshow as true/false but not in showHideColumns then remove it
-		$this->colToshow       = array_intersect($this->model->getState('colToshow'), $this->model->showhideCols);
+		$this->colToshow       = $this->model->getState('colToshow');
 
 		$this->filterValues    = $this->model->getState('filters');
 

diff --git a/tjreports/tjreports.xml b/tjreports/tjreports.xml
@@ -6,8 +6,8 @@
 	<authorUrl>https://techjoomla.com</authorUrl>
 	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<creationDate>24th Oct 2019</creationDate>
-	<version>1.1.3</version>
+	<creationDate>11th Nov 2019</creationDate>
+	<version>1.1.4</version>
 	<description>This component is used to access all the report at single place.</description>
 	<install>
 		<!-- Runs on install -->