Merge branch '4.0-dev' into fix-atum-bg-color

joomla · Apr 29, 2020 · a3ad2d7 · a3ad2d7
2 parents 77207cd + 862190a
commit a3ad2d7
Show file tree

Hide file tree

Showing 132 changed files with 1,627 additions and 1,149 deletions.
diff --git a/administrator/components/com_actionlogs/config.xml b/administrator/components/com_actionlogs/config.xml
@@ -17,6 +17,7 @@
 			type="list"
 			label="COM_ACTIONLOGS_CSV_DELIMITER_LABEL"
 			default=","
+			validate="options"
 			>
 			<option value=",">COM_ACTIONLOGS_COMMA</option>
 			<option value=";">COM_ACTIONLOGS_SEMICOLON</option>
@@ -47,6 +48,7 @@
 			showon="loggable_api:1"
 			default="GET"
 			validate="options"
+			layout="joomla.form.field.list-fancy-select"
 			>
 			<option value="GET">COM_ACTIONLOGS_FIELD_VALUE_GET</option>
 			<option value="POST">COM_ACTIONLOGS_FIELD_VALUE_POST</option>

diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql
@@ -11,6 +11,7 @@ ALTER TABLE `#__finder_filters` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4
 ALTER TABLE `#__finder_filters` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 TRUNCATE TABLE `#__finder_links`;
+ALTER TABLE `#__finder_links` CHANGE `route` `route` varchar(400);
 ALTER TABLE `#__finder_links` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `access`;
 ALTER TABLE `#__finder_links` MODIFY `state` int(5) NOT NULL DEFAULT 1;
 ALTER TABLE `#__finder_links` MODIFY `access` int(5) NOT NULL DEFAULT 0;

diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql
@@ -10,6 +10,7 @@ ALTER TABLE "#__finder_filters" ALTER COLUMN "checked_out_time" DROP NOT NULL;
 ALTER TABLE "#__finder_filters" ALTER COLUMN "checked_out_time" DROP DEFAULT;
 
 TRUNCATE TABLE "#__finder_links";
+ALTER TABLE "#__finder_links" ALTER COLUMN "route" TYPE character varying(400);
 ALTER TABLE "#__finder_links" ALTER COLUMN "state" SET NOT NULL;
 ALTER TABLE "#__finder_links" ALTER COLUMN "access" SET NOT NULL;
 ALTER TABLE "#__finder_links" ALTER COLUMN "language" TYPE character varying(7);

diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
@@ -12,6 +12,7 @@
 			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
 			id="purchase_type"
 			default="1"
+			validate="options"
 			>
 			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
 			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>

diff --git a/administrator/components/com_banners/forms/banner.xml b/administrator/components/com_banners/forms/banner.xml
@@ -46,6 +46,7 @@
 			class="custom-select-color-state"
 			size="1"
 			default="1"
+			validate="options"
 			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
@@ -90,6 +91,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_TYPE_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="0">COM_BANNERS_FIELD_VALUE_IMAGE</option>
 			<option value="1">COM_BANNERS_FIELD_VALUE_CUSTOM</option>
@@ -238,6 +240,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT</option>
 			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
@@ -252,6 +255,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT</option>
 			<option value="0">JNO</option>
@@ -263,6 +267,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_TRACKCLICK_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT</option>
 			<option value="0">JNO</option>

diff --git a/administrator/components/com_banners/forms/client.xml b/administrator/components/com_banners/forms/client.xml
@@ -41,6 +41,7 @@
 			class="custom-select-color-state"
 			size="1"
 			default="1"
+			validate="options"
 			>
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
@@ -61,6 +62,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="-1">JGLOBAL_USE_GLOBAL</option>
 			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
@@ -75,6 +77,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="-1">JGLOBAL_USE_GLOBAL</option>
 			<option value="0">JNO</option>
@@ -86,6 +89,7 @@
 			type="list"
 			label="COM_BANNERS_FIELD_TRACKCLICK_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="-1">JGLOBAL_USE_GLOBAL</option>
 			<option value="0">JNO</option>

diff --git a/administrator/components/com_banners/forms/filter_clients.xml b/administrator/components/com_banners/forms/filter_clients.xml
@@ -25,6 +25,7 @@
 			label="COM_BANNERS_SELECT_TYPE"
 			default="0"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">COM_BANNERS_SELECT_TYPE</option>
 			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>

diff --git a/administrator/components/com_banners/forms/filter_tracks.xml b/administrator/components/com_banners/forms/filter_tracks.xml
@@ -36,6 +36,7 @@
 			type="list"
 			label="COM_BANNERS_SELECT_TYPE"
 			onchange="this.form.submit();"
+			validate="options"
 			>
 			<option value="">COM_BANNERS_SELECT_TYPE</option>
 			<option value="1">COM_BANNERS_TYPE1</option>

diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
@@ -114,6 +114,7 @@
 		default="1"
 		class="custom-select-color-state"
 		size="1"
+		validate="options"
 		>
 		<option value="1">JPUBLISHED</option>
 		<option value="0">JUNPUBLISHED</option>
@@ -267,6 +268,7 @@
 				name="robots"
 				type="list"
 				label="JFIELD_METADATA_ROBOTS_LABEL"
+				validate="options"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>

diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
@@ -10,6 +10,7 @@
 			label="COM_CONFIG_FIELD_CACHE_LABEL"
 			default="2"
 			filter="integer"
+			validate="options"
 			>
 			<option value="0">COM_CONFIG_FIELD_VALUE_CACHE_OFF</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE</option>
@@ -215,6 +216,7 @@
 			label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_LABEL"
 			default="0"
 			filter="integer"
+			validate="options"
 			>
 			<option value="0">COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_VALUE_NONE</option>
 			<option value="1">COM_CONFIG_FIELD_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY</option>
@@ -526,6 +528,7 @@
 			default="mail"
 			filter="word"
 			showon="mailonline:1"
+			validate="options"
 			>
 			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
 			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
@@ -572,6 +575,7 @@
 			default="none"
 			showon="mailonline:1[AND]mailer:smtp"
 			filter="word"
+			validate="options"
 			>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="ssl">COM_CONFIG_FIELD_VALUE_SSL</option>
@@ -633,6 +637,7 @@
 			type="list"
 			label="JFIELD_METADATA_ROBOTS_LABEL"
 			default=""
+			validate="options"
 			>
 			<option value="">JGLOBAL_INDEX_FOLLOW</option>
 			<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
@@ -745,6 +750,7 @@
 			label="COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL"
 			default="0"
 			filter="integer"
+			validate="options"
 			>
 			<option value="2">COM_CONFIG_FIELD_VALUE_AFTER</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_BEFORE</option>
@@ -783,6 +789,7 @@
 			label="COM_CONFIG_FIELD_ERROR_REPORTING_LABEL"
 			default="default"
 			filter="cmd"
+			validate="options"
 			>
 			<option value="default">COM_CONFIG_FIELD_VALUE_SYSTEM_DEFAULT</option>
 			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
@@ -796,6 +803,7 @@
 			label="COM_CONFIG_FIELD_FORCE_SSL_LABEL"
 			default="-1"
 			filter="integer"
+			validate="options"
 			>
 			<option value="0">COM_CONFIG_FIELD_VALUE_NONE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY</option>
@@ -970,6 +978,7 @@
 			default="1"
 			filter="integer"
 			showon="offline:1"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM</option>
@@ -999,6 +1008,7 @@
 			label="COM_CONFIG_FRONTEDITING_LABEL"
 			default="1"
 			filter="integer"
+			validate="options"
 			>
 			<option value="2">COM_CONFIG_FRONTEDITING_MENUSANDMODULES</option>
 			<option value="1">COM_CONFIG_FRONTEDITING_MODULES</option>
@@ -1039,6 +1049,7 @@
 			label="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL"
 			default="20"
 			filter="integer"
+			validate="options"
 			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
@@ -1058,6 +1069,7 @@
 			label="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL"
 			default="10"
 			filter="integer"
+			validate="options"
 			>
 			<option value="5">J5</option>
 			<option value="10">J10</option>
@@ -1075,6 +1087,7 @@
 			label="COM_CONFIG_FIELD_FEED_EMAIL_LABEL"
 			default="none"
 			filter="word"
+			validate="options"
 			>
 			<option value="author">COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL</option>
 			<option value="site">COM_CONFIG_FIELD_VALUE_SITE_EMAIL</option>

diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
@@ -20,6 +20,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 			default="hide"
+			validate="options"
 			>
 			<option value="hide">JHIDE</option>
 			<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
@@ -295,6 +296,7 @@
 			label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
 			default="10"
 			showon="show_articles:1"
+			validate="options"
 			>
 			<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
 			<option value="5">J5</option>
@@ -402,6 +404,7 @@
 			type="list"
 			label="COM_CONTACT_FIELD_ICONS_SETTINGS_LABEL"
 			default="0"
+			validate="options"
 			>
 			<option value="0">COM_CONTACT_FIELD_VALUE_ICONS</option>
 			<option value="1">COM_CONTACT_FIELD_VALUE_TEXT</option>
@@ -515,6 +518,7 @@
 			type="list"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			default="-1"
+			validate="options"
 			>
 			<option value="-1">JALL</option>
 			<option value="0">JNONE</option>
@@ -592,6 +596,7 @@
 			type="list"
 			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
 			default="-1"
+			validate="options"
 			>
 			<option value="-1">JALL</option>
 			<option value="0">JNONE</option>
@@ -787,6 +792,7 @@
 			type="list"
 			label="JGLOBAL_PAGINATION_LABEL"
 			default="2"
+			validate="options"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -810,6 +816,7 @@
  			type="list"
  			label="COM_CONTACT_NUMBER_CONTACTS_LIST_LABEL"
  			default="10"
+			validate="options"
  			>
  			<option value="5">J5</option>
  			<option value="10">J10</option>