1.0.42

astridx · Jul 15, 2019 · f294911 · f294911
1 parent 9d44e73
commit f294911
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 13 deletions.
diff --git a/agosms-update.xml b/agosms-update.xml
@@ -252,4 +252,22 @@
         <maintainerurl>https://astrid-guenther.de</maintainerurl>
         <targetplatform name="joomla" version="3.*"/>
     </update>
+    <update>
+        <name>pkg_agosms</name>
+        <description>pkg_agosms</description>
+        <element>pkg_agosms</element>
+        <type>package</type>
+        <client>site</client>
+        <version>1.0.42</version>
+        <infourl title="agosms">https://github.com/astridx/pkg_agosms/blob/v1.0.42/README.md</infourl>
+        <downloads>
+            <downloadurl type="full" format="zip">https://github.com/astridx/pkg_agosms/releases/download/v1.0.42/pkg-agosms.zip</downloadurl>
+        </downloads>
+        <tags>
+            <tag>stable</tag>
+        </tags>
+        <maintainer>Astrid Günther</maintainer>
+        <maintainerurl>https://astrid-guenther.de</maintainerurl>
+        <targetplatform name="joomla" version="3.*"/>
+    </update>
 </updates>
diff --git a/dist/current b/dist/current
@@ -1 +1 @@
-/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.41
+/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.42
diff --git a/dist/pkg-agosms.zip b/dist/pkg-agosms.zip
@@ -1 +1 @@
-/home/astrid/git/joomla-development/pkg_agosms/dist/pkg-agosms-1.0.41.zip
+/home/astrid/git/joomla-development/pkg_agosms/dist/pkg-agosms-1.0.42.zip
diff --git a/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml b/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml
@@ -2,12 +2,12 @@
 <extension type="component" version="3.5" method="upgrade">
         <name>com_agosms</name>
 	<author>Astrid Günther</author>
-	<creationDate>2019-07-14</creationDate>
+	<creationDate>2019-07-15</creationDate>
 	<copyright>(C) 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later;</license>
 	<authorEmail>info@astrid-guenther.de</authorEmail>
 	<authorUrl>www.astrid-guenther.de</authorUrl>
-	<version>1.0.41</version>
+	<version>1.0.42</version>
 	<description>COM_AGOSMS_XML_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
 

diff --git a/dist/tmp/cbuild/components/com_agosms/helpers/association.php b/dist/tmp/cbuild/components/com_agosms/helpers/association.php
@@ -17,7 +17,7 @@
 /**
  * Agosms Component Association Helper
  *
- * @since  __DEPLOY_VERSION__
+ * @since  1.0.42
  */
 abstract class AgosmsHelperAssociation extends CategoryHelperAssociation
 {
@@ -29,7 +29,7 @@ abstract class AgosmsHelperAssociation extends CategoryHelperAssociation
 	 *
 	 * @return  array   Array of associations for the item
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   1.0.42
 	 */
 	public static function getAssociations($id = 0, $view = null)
 	{

diff --git a/dist/zips/com_agosms.zip b/dist/zips/com_agosms.zip
diff --git a/dist/zips/mod_agosm.zip b/dist/zips/mod_agosm.zip
diff --git a/src/administrator/language/en-GB/en-GB.plg_fields_agosmsaddressmarker.ini b/src/administrator/language/en-GB/en-GB.plg_fields_agosmsaddressmarker.ini
@@ -7,7 +7,7 @@ PLG_AGOSMSADDRESSMARKER_USED_FIELDS="<h3>Used Custom Fields - label (name, id):<
 PLG_AGOSMSADDRESSMARKER_LAT="Latitude (decimal)"
 PLG_AGOSMSADDRESSMARKER_LON="Longitude (decimal)"
 PLG_AGOSMSADDRESSMARKER_CALCULATE_CORDS="Calculate coordinates"
-PLG_AGOSMSADDRESSMARKER_ADDRESS="Address"
+PLG_AGOSMSADDRESSMARKER_ADDRESS="ADDRESS"
 PLG_AGOSMSADDRESSMARKER_ADDRESSFIELDS="Adressfields"
 PLG_AGOSMSADDRESSMARKER_CFIELD="Custom Field"
 PLG_AGOSMSADDRESSMARKER_CFIELDLABEL="Custom Field Description"

diff --git a/src/components/com_agosms/helpers/association.php b/src/components/com_agosms/helpers/association.php
@@ -17,7 +17,7 @@
 /**
  * Agosms Component Association Helper
  *
- * @since  __DEPLOY_VERSION__
+ * @since  1.0.42
  */
 abstract class AgosmsHelperAssociation extends CategoryHelperAssociation
 {
@@ -29,7 +29,7 @@ abstract class AgosmsHelperAssociation extends CategoryHelperAssociation
 	 *
 	 * @return  array   Array of associations for the item
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   1.0.42
 	 */
 	public static function getAssociations($id = 0, $view = null)
 	{

diff --git a/src/plugins/fields/agosmsaddressmarker/field/agosmsaddressmarker.php b/src/plugins/fields/agosmsaddressmarker/field/agosmsaddressmarker.php
@@ -86,7 +86,7 @@ class JFormFieldAgosmsaddressmarker extends JFormFieldText
 	 * The name of the addressfields field.
 	 *
 	 * @var    string
-	 * @since  __DEPLOY_VERSION__
+	 * @since  1.0.42
 	 */
 	protected $scrollwheelzoom; 
 

diff --git a/src/plugins/fields/agosmsaddressmarker/field/cfield.php b/src/plugins/fields/agosmsaddressmarker/field/cfield.php
@@ -60,7 +60,8 @@ protected function getOptions()
 			$query = $db->getQuery(true)
 				->select('cf.id AS value, cf.name AS text')
 				->from('#__fields AS cf')
-				// Todo->join('INNER', '#__content AS c ON c.tag = cf.id')
+				->where('cf.state IN (1)')
+				->where('cf.type NOT IN ("agosmsaddressmarker")')
 				->group('cf.id, cf.name')
 				->order('cf.name');
 

diff --git a/src/plugins/fields/agosmsaddressmarker/models/forms/address_data.xml b/src/plugins/fields/agosmsaddressmarker/models/forms/address_data.xml
@@ -9,15 +9,13 @@
 			label="PLG_AGOSMSADDRESSMARKER_CFIELD"
 			description="PLG_AGOSMSADDRESSMARKER_CFIELD_DESC"
 			>
-			<option value="0">JNONE</option>
 		</field>
 		<field
 			name="name"
 			type="list"
 			label="PLG_AGOSMSADDRESSMARKER_CFIELDLABEL"
 			description="PLG_AGOSMSADDRESSMARKER_CFIELDLABEL_DESC"
 			>
-			<option value="0">JNONE</option>
 			<option value="country">PLG_AGOSMSADDRESSMARKER_COUNTRY</option>
 			<option value="region">PLG_AGOSMSADDRESSMARKER_REGION</option>
 			<option value="postcode">PLG_AGOSMSADDRESSMARKER_POSTCODE</option>