Merge Release 1.1.0 into release-1.1.1 (#140)

* folder structure changed: moved pligins to tjreports folder * Issue #138 fix: Maintainance: move the plugins folder under the tjreports(src) folder * Issue #139 fix:Install the indexer table from plugin * Update indexer.php
techjoomla · Jul 12, 2019 · edf19e5 · edf19e5
1 parent d780671
commit edf19e5
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 16 deletions.
diff --git a/build/bump.php b/build/bump.php
@@ -49,10 +49,10 @@ function usage($command)
 // This file will vary from component to component
 $coreXmlFiles = array(
 	'/tjreports/tjreports.xml',
-	'/plugins/actionlog/tjreports/tjreports.xml',
-	'/plugins/content/tjreportsfields/tjreportsfields.xml',
-	'/plugins/privacy/tjreports/tjreports.xml',
-	'/plugins/user/tjreportsindexer/tjreportsindexer.xml'
+	'/tjreports/plugins/actionlog/tjreports/tjreports.xml',
+	'/tjreports/plugins/content/tjreportsfields/tjreportsfields.xml',
+	'/tjreports/plugins/privacy/tjreports/tjreports.xml',
+	'/tjreports/plugins/user/tjreportsindexer/tjreportsindexer.xml'
 );
 
 $antJobFile = '/build.xml';

diff --git a/plugins/actionlog/tjreports/index.html → ...ts/plugins/actionlog/tjreports/index.html b/plugins/actionlog/tjreports/index.html → ...ts/plugins/actionlog/tjreports/index.html
diff --git a/...e/en-GB/en-GB.plg_actionlog_tjreports.ini → ...e/en-GB/en-GB.plg_actionlog_tjreports.ini b/...e/en-GB/en-GB.plg_actionlog_tjreports.ini → ...e/en-GB/en-GB.plg_actionlog_tjreports.ini
diff --git a/...-GB/en-GB.plg_actionlog_tjreports.sys.ini → ...-GB/en-GB.plg_actionlog_tjreports.sys.ini b/...-GB/en-GB.plg_actionlog_tjreports.sys.ini → ...-GB/en-GB.plg_actionlog_tjreports.sys.ini
diff --git a/plugins/actionlog/tjreports/tjreports.php → ...plugins/actionlog/tjreports/tjreports.php b/plugins/actionlog/tjreports/tjreports.php → ...plugins/actionlog/tjreports/tjreports.php
diff --git a/plugins/actionlog/tjreports/tjreports.xml → ...plugins/actionlog/tjreports/tjreports.xml b/plugins/actionlog/tjreports/tjreports.xml → ...plugins/actionlog/tjreports/tjreports.xml
@@ -2,7 +2,7 @@
 <extension version="3.9" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_tjreports</name>
 	<author>Techjoomla</author>
-	<creationDate>24th Jun 2019</creationDate>
+	<creationDate>11th Jul 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>

diff --git a/plugins/content/tjreportsfields/index.html → ...lugins/content/tjreportsfields/index.html b/plugins/content/tjreportsfields/index.html → ...lugins/content/tjreportsfields/index.html
diff --git a/...-GB/en-GB.plg_content_tjreportsfields.ini → ...-GB/en-GB.plg_content_tjreportsfields.ini b/...-GB/en-GB.plg_content_tjreportsfields.ini → ...-GB/en-GB.plg_content_tjreportsfields.ini
diff --git a/...en-GB.plg_content_tjreportsfields.sys.ini → ...en-GB.plg_content_tjreportsfields.sys.ini b/...en-GB.plg_content_tjreportsfields.sys.ini → ...en-GB.plg_content_tjreportsfields.sys.ini
diff --git a/...ntent/tjreportsfields/tjreportsfields.php → ...ntent/tjreportsfields/tjreportsfields.php b/...ntent/tjreportsfields/tjreportsfields.php → ...ntent/tjreportsfields/tjreportsfields.php
diff --git a/...ntent/tjreportsfields/tjreportsfields.xml → ...ntent/tjreportsfields/tjreportsfields.xml b/...ntent/tjreportsfields/tjreportsfields.xml → ...ntent/tjreportsfields/tjreportsfields.xml
@@ -3,12 +3,12 @@
 	<name>plg_content_tjreportsfields</name>
 	<description>PLG_CONTENT_TJREPORTSFIELDS_XML_DESCRIPTION</description>
 	<author>Techjoomla</author>
-	<authorEmail>contact@techjoomla.com</authorEmail>
+	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>24th May 2019</creationDate>
-	<copyright>Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.</copyright>
+	<creationDate>11th Jul 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.0.0</version>
+	<version>1.1.0</version>
 
 	<files>
 		<filename plugin="tjreportsfields">tjreportsfields.php</filename>

diff --git a/plugins/privacy/tjreports/index.html → ...orts/plugins/privacy/tjreports/index.html b/plugins/privacy/tjreports/index.html → ...orts/plugins/privacy/tjreports/index.html
diff --git a/...age/en-GB/en-GB.plg_privacy_tjreports.ini → ...age/en-GB/en-GB.plg_privacy_tjreports.ini b/...age/en-GB/en-GB.plg_privacy_tjreports.ini → ...age/en-GB/en-GB.plg_privacy_tjreports.ini
diff --git a/...en-GB/en-GB.plg_privacy_tjreports.sys.ini → ...en-GB/en-GB.plg_privacy_tjreports.sys.ini b/...en-GB/en-GB.plg_privacy_tjreports.sys.ini → ...en-GB/en-GB.plg_privacy_tjreports.sys.ini
diff --git a/plugins/privacy/tjreports/tjreports.php → ...s/plugins/privacy/tjreports/tjreports.php b/plugins/privacy/tjreports/tjreports.php → ...s/plugins/privacy/tjreports/tjreports.php
diff --git a/plugins/privacy/tjreports/tjreports.xml → ...s/plugins/privacy/tjreports/tjreports.xml b/plugins/privacy/tjreports/tjreports.xml → ...s/plugins/privacy/tjreports/tjreports.xml
@@ -2,7 +2,7 @@
 <extension version="3.4" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_tjreports</name>
 	<version>1.1.0</version>
-	<creationDate>24th Jun 2019</creationDate>
+	<creationDate>11th Jul 2019</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>

diff --git a/plugins/user/tjreportsindexer/index.html → .../plugins/user/tjreportsindexer/index.html b/plugins/user/tjreportsindexer/index.html → .../plugins/user/tjreportsindexer/index.html
diff --git a/...en-GB/en-GB.plg_user_tjreportsindexer.ini → ...en-GB/en-GB.plg_user_tjreportsindexer.ini b/...en-GB/en-GB.plg_user_tjreportsindexer.ini → ...en-GB/en-GB.plg_user_tjreportsindexer.ini
diff --git a/...B/en-GB.plg_user_tjreportsindexer.sys.ini → ...B/en-GB.plg_user_tjreportsindexer.sys.ini b/...B/en-GB.plg_user_tjreportsindexer.sys.ini → ...B/en-GB.plg_user_tjreportsindexer.sys.ini
diff --git a/tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql b/tjreports/plugins/user/tjreportsindexer/sql/tjreportsindexer.install.sql
@@ -0,0 +1,3 @@
+CREATE TABLE IF NOT EXISTS `#__tjreports_com_users_user` (
+  `record_id` int(11) NOT NULL
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.0.sql b/tjreports/plugins/user/tjreportsindexer/sql/updates/mysql/1.1.0.sql
@@ -0,0 +1,3 @@
+CREATE TABLE IF NOT EXISTS `#__tjreports_com_users_user` (
+  `record_id` int(11) NOT NULL,
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/...ser/tjreportsindexer/tjreportsindexer.php → ...ser/tjreportsindexer/tjreportsindexer.php b/...ser/tjreportsindexer/tjreportsindexer.php → ...ser/tjreportsindexer/tjreportsindexer.php
diff --git a/...ser/tjreportsindexer/tjreportsindexer.xml → ...ser/tjreportsindexer/tjreportsindexer.xml b/...ser/tjreportsindexer/tjreportsindexer.xml → ...ser/tjreportsindexer/tjreportsindexer.xml
@@ -3,16 +3,26 @@
 	<name>plg_user_tjreportsindexer</name>
 	<description>PLG_USER_TJREPORTSINDEXER_XML_DESCRIPTION</description>
 	<author>Techjoomla</author>
-	<authorEmail>contact@techjoomla.com</authorEmail>
+	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>24th May 2019</creationDate>
-	<copyright>Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.</copyright>
+	<creationDate>11th Jul 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.0.0</version>
-
+	<version>1.1.0</version>
+	<install>
+        <sql>
+            <file driver="mysql" charset="utf8">sql/tjreportsindexer.install.sql</file>
+        </sql>
+    </install>
+	<update>
+		<schemas>
+			<schemapath type="mysql">sql/updates/mysql</schemapath>
+		</schemas>
+	</update>
 	<files>
 		<filename plugin="tjreportsindexer">tjreportsindexer.php</filename>
 		<filename>index.html</filename>
+		<folder>sql</folder>
 	</files>
 
 	<languages folder="language">

diff --git a/tjreports/tjreports.xml b/tjreports/tjreports.xml
@@ -6,7 +6,7 @@
 	<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 Jun 2019</creationDate>
+	<creationDate>11th Jul 2019</creationDate>
 	<version>1.1.0</version>
 	<description>This component is used to access all the report at single place.</description>
 	<install>