Merge pull request #102 from techjoomla/release-1.0.2

Release 1.0.2

tjreports/administrator/controllers/tjreports.php

@@ -55,4 +55,68 @@ public function setRedirect($url, $msg = null,$type = null)
 
 		parent::setRedirect($url, $msg, $type);
 	}
+
+	/**
+	 * Discover installed plugins
+	 *
+	 * @return  JModel
+	 *
+	 * @since   1.6
+	 */
+	public function discover()
+	{
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjreports/models');
+		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjreports/tables');
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('element');
+		$query->from($db->quoteName('#__extensions'));
+		$query->where($db->quoteName('type') . "=" . $db->quote('plugin'));
+		$query->where($db->quoteName('folder') . "=" . $db->quote('tjreports'));
+		$db->setQuery($query);
+		$allPlugins = $db->loadColumn();
+
+		$query = $db->getQuery(true);
+		$query->select('plugin');
+		$query->from($db->quoteName('#__tj_reports'));
+		$db->setQuery($query);
+		$tjReportsPlugins = $db->loadColumn();
+
+		$discoverPlugins = array_diff($allPlugins, $tjReportsPlugins);
+
+		$count = 0;
+
+		foreach ($discoverPlugins as $value)
+		{
+			$model = JModelLegacy::getInstance('Reports', 'TjreportsModel');
+			$pluginName = $value;
+			$reportTable = JTable::getInstance('Tjreport', 'TjreportsTable');
+			$details = $model->getPluginInstallationDetail($pluginName);
+			$reportTable->load(array('plugin' => $pluginName, 'userid' => 0));
+
+			if (!$reportTable->id)
+			{
+				$data = array();
+				$data['title']  = $details['title'];
+				$data['plugin']  = $pluginName;
+				$data['alias']  = $pluginName;
+				$data['client']  = $details['client'];
+				$data['parent']  = 0;
+				$data['default']  = 1;
+
+				$reportTable->save($data);
+				$count++;
+			}
+		}
+
+		$message = JText::_('COM_TJREPORTS_NOTHING_TO_DISCOVER_PLUGINS');
+
+		if ($count > 0)
+		{
+			$message = JText::sprintf(JText::_('COM_TJREPORTS_DISCOVER_NEW_PLUGINS'), $count);
+		}
+
+		$this->setRedirect('index.php?option=com_tjreports', $message);
+	}
 }

tjreports/administrator/views/tjreports/view.html.php

@@ -73,11 +73,6 @@ protected function addToolBar()
 
 		JToolBarHelper::title($name, 'list');
 
-		if ($this->canDo->get('core.delete'))
-		{
-			JToolBarHelper::deleteList('', 'tjreports.delete');
-		}
-
 		if ($this->canDo->get('core.create'))
 		{
 			JToolBarHelper::addNew('tjreport.add');
@@ -88,9 +83,19 @@ protected function addToolBar()
 			JToolBarHelper::editList('tjreport.edit');
 		}
 
+		if ($this->canDo->get('core.delete'))
+		{
+			JToolBarHelper::deleteList('', 'tjreports.delete');
+		}
+
 		if ($this->canDo->get('core.admin'))
 		{
 			JToolBarHelper::preferences('com_tjreports');
 		}
+
+		if ($this->canDo->get('core.create'))
+		{
+			JToolBarHelper::custom('tjreports.discover', 'refresh', 'refresh', 'JLIB_INSTALLER_DISCOVER', false);
+		}
 	}
 }

tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini

@@ -133,3 +133,7 @@ COM_TJREPORTS_DELETE_QUERY="Delete Query"
 COM_TJREPORTS_SAVE_QUERY="Save Query"
 COM_TJREPORTS_ENTER_TITLE="Enter title for the Query"
 COM_TJREPORTS_QUERY_DELETE_SUCCESS="Query deleted successfully."
+
+;Added in v1.0.2
+COM_TJREPORTS_NOTHING_TO_DISCOVER_PLUGINS="Nothing to discover"
+COM_TJREPORTS_DISCOVER_NEW_PLUGINS="%d new plugin(s) discovered"

tjreports/tjreports.xml

@@ -7,7 +7,7 @@
     <author>Parth Lawate</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>http://techjoomla.com</authorUrl>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <description>This component is used to access all the report at single place.</description>
 
     <install> <!-- Runs on install -->