Merge pull request #53 from techjoomla/release-1.1.3

manojLondhe · web-flow · commit 4e1a20100bcc · 2021-07-22T15:05:46.000+05:30
Merge `Release 1.1.3` into `master`
diff --git a/administrator/models/hierarchys.php b/administrator/models/hierarchys.php
@@ -169,22 +169,23 @@ public function getItems()
 		{
 			foreach ($items as $item)
 			{
-				$item->ReportsToUserName = array();
-				$item->ReportsTo = array();
+				$reportsToUserName = array();
 
 				if ($item->subuserId)
 				{
 					$results = $this->hierarchyModel->getReportsTo($item->user_id);
-					$item->ReportsTo = $results;
 
 					foreach ($results as $res)
 					{
 						if (!empty($res->name))
 						{
-							$item->ReportsToUserName[] = $res->name;
+							$reportsToUserName[] = $res->name;
 						}
 					}
 				}
+
+				$item->ReportsToUserNameStr = implode(", ", $reportsToUserName);
+				$item->ReportsToUserStr     = implode(", ", array_column($results, 'reports_to'));
 			}
 		}
 
diff --git a/administrator/views/hierarchys/tmpl/default.php b/administrator/views/hierarchys/tmpl/default.php
@@ -107,9 +107,9 @@
 			<?php
 
 				foreach ($this->items as $i => $item) :
-					$ordering   = ($listOrder == 'a.+ordering');
+					$ordering = ($listOrder == 'a.+ordering');
+					$userName = $item->ReportsToUserNameStr;
 
-					$userName = implode(', ', $item->ReportsToUserName);
 					?>
 					<tr class="row<?php echo $i % 2; ?> reports_to">
 						<td class='center'><?php echo JHtml::_('grid.id', $i, $item->subuserId); ?></td>
diff --git a/hierarchy.xml b/hierarchy.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.0" method="upgrade">
     <name>com_hierarchy</name>
-    <creationDate>22nd Oct 2019</creationDate>
-    <copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+    <creationDate>22nd Jul 2021</creationDate>
+    <copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
     <author>Techjoomla</author>
     <authorEmail>extensions@techjoomla.com</authorEmail>
     <authorUrl>https://techjoomla.com</authorUrl>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <description>This tool will let the admin set a ‘Reports to’ field for each user in the system. This will be updated en masse using a CSV</description>
 
     <install> <!-- Runs on install -->
diff --git a/plugins/actionlog/hierarchy/hierarchy.xml b/plugins/actionlog/hierarchy/hierarchy.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_hierarchy</name>
-	<version>1.1.2</version>
-	<creationDate>22nd Oct 2019</creationDate>
+	<version>1.1.3</version>
+	<creationDate>22nd Jul 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_ACTIONLOG_HIERARCHY_XML_DESCRIPTION</description>
 	<files>
diff --git a/plugins/privacy/hierarchy/hierarchy.xml b/plugins/privacy/hierarchy/hierarchy.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.4" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_hierarchy</name>
-	<version>1.1.2</version>
-	<creationDate>22nd Oct 2019</creationDate>
+	<version>1.1.3</version>
+	<creationDate>22nd Jul 2021</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2021 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_PRIVACY_HIERARCHY_XML_DESCRIPTION</description>
 	<files>
diff --git a/script.hierarchy.php b/script.hierarchy.php
@@ -118,7 +118,7 @@ public function installSqlFiles($parent)
 				{
 					$query = trim($query);
 
-					if ($query != '' && $query{0} != '#')
+					if ($query != '' && $query[0]!= '#')
 					{
 						$db->setQuery($query);
 

Original file line number	Diff line number	Diff line change
`@@ -169,22 +169,23 @@ public function getItems()`
`169`	`169`	`{`
`170`	`170`	`foreach ($items as $item)`
`171`	`171`	`{`
`172`		`- $item->ReportsToUserName = array();`
`173`		`- $item->ReportsTo = array();`
	`172`	`+ $reportsToUserName = array();`
`174`	`173`
`175`	`174`	`if ($item->subuserId)`
`176`	`175`	`{`
`177`	`176`	`$results = $this->hierarchyModel->getReportsTo($item->user_id);`
`178`		`- $item->ReportsTo = $results;`
`179`	`177`
`180`	`178`	`foreach ($results as $res)`
`181`	`179`	`{`
`182`	`180`	`if (!empty($res->name))`
`183`	`181`	`{`
`184`		`- $item->ReportsToUserName[] = $res->name;`
	`182`	`+ $reportsToUserName[] = $res->name;`
`185`	`183`	`}`
`186`	`184`	`}`
`187`	`185`	`}`
	`186`	`+`
	`187`	`+ $item->ReportsToUserNameStr = implode(", ", $reportsToUserName);`
	`188`	`+ $item->ReportsToUserStr = implode(", ", array_column($results, 'reports_to'));`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function installSqlFiles($parent)`
`118`	`118`	`{`
`119`	`119`	`$query = trim($query);`
`120`	`120`
`121`		`- if ($query != '' && $query{0} != '#')`
	`121`	`+ if ($query != '' && $query[0]!= '#')`
`122`	`122`	`{`
`123`	`123`	`$db->setQuery($query);`
`124`	`124`