Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/303823

Change subject: Update manifest_version to version 2
......................................................................

Update manifest_version to version 2

Bug: T142392
Change-Id: I64cbb7cb04ef62b50efb52e49954cf47b78cb768
---
M SemanticForms.php
M extension.json
2 files changed, 88 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/23/303823/1

diff --git a/SemanticForms.php b/SemanticForms.php
index 07f3325..834f1ca 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -51,7 +51,7 @@
 // extension.json. For simplicity's sake, don't load extensions unless we're
 // at version 1.27 or higher.
 //if ( function_exists( 'wfLoadExtension' ) ) {
-if ( version_compare( $GLOBALS['wgVersion'], '1.27c', '>' ) ) {
+if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
        if ( function_exists( 'wfLoadExtension' ) ) {
                wfLoadExtension( 'SemanticForms' );
                // Keep i18n globals so mergeMessageFileList.php doesn't break
diff --git a/extension.json b/extension.json
index d3524bb..15f5129 100644
--- a/extension.json
+++ b/extension.json
@@ -17,7 +17,7 @@
                "SFHooks::initialize"
        ],
        "require": {
-               "MediaWiki": ">= 1.27.0"
+               "MediaWiki": ">= 1.28.0"
        },
        "GroupPermissions": {
                "*": {
@@ -301,7 +301,6 @@
                                "htmlform-yes",
                                "htmlform-no"
                        ]
-
                },
                "ext.semanticforms": {
                        "scripts": [
@@ -385,45 +384,93 @@
                ]
        },
        "config": {
-               "_prefix": "",
-               "sfgMaxAutocompleteValues": 1000,
-               "sfgMaxLocalAutocompleteValues": 100,
-               "sfgAutocompleteOnAllChars": false,
-               "sfgCacheAutocompleteValues": false,
-               "sfgAutocompleteCacheTimeout": null,
-               "sfgRenameEditTabs": false,
-               "sfgRenameMainEditTab": false,
-               "sfgListSeparator": ",",
-               "sfg24HourTime": false,
-               "sfgCacheFormDefinitions": false,
-               "sfgFormCacheType": null,
-               "sfgLinkAllRedLinksToForms": false,
-               "sfgRedLinksCheckOnlyLocalProps": false,
-               "sfgShowTabsForAllHelperForms": true,
-               "sfgRunQueryFormAtTop": false,
-               "sfgShowOnSelect": [],
-               "sfgAutocompleteValues": [],
-               "sfgGridValues": [],
-               "sfgGridParams": [],
-               "sfgFieldProperties": [],
-               "sfgCargoFields": [],
-               "sfgDependentFields": [],
-               "sfgCheckboxesSelectAllMinimum": 10,
-
+               "sfgMaxAutocompleteValues": {
+                       "value": 1000
+               },
+               "sfgMaxLocalAutocompleteValues": {
+                       "value": 100
+               },
+               "sfgAutocompleteOnAllChars": {
+                       "value": false
+               },
+               "sfgCacheAutocompleteValues": {
+                       "value": false
+               },
+               "sfgAutocompleteCacheTimeout": {
+                       "value": null
+               },
+               "sfgRenameEditTabs": {
+                       "value": false
+               },
+               "sfgRenameMainEditTab": {
+                       "value": false
+               },
+               "sfgListSeparator": {
+                       "value": ","
+               },
+               "sfg24HourTime": {
+                       "value": false
+               },
+               "sfgCacheFormDefinitions": {
+                       "value": false
+               },
+               "sfgFormCacheType": {
+                       "value": null
+               },
+               "sfgLinkAllRedLinksToForms": {
+                       "value": false
+               },
+               "sfgRedLinksCheckOnlyLocalProps": {
+                       "value": false
+               },
+               "sfgShowTabsForAllHelperForms": {
+                       "value": true
+               },
+               "sfgRunQueryFormAtTop": {
+                       "value": false
+               },
+               "sfgShowOnSelect": {
+                       "value": []
+               },
+               "sfgAutocompleteValues": {
+                       "value": []
+               },
+               "sfgGridValues": {
+                       "value": []
+               },
+               "sfgGridParams": {
+                       "value": []
+               },
+               "sfgFieldProperties": {
+                       "value": []
+               },
+               "sfgCargoFields": {
+                       "value": []
+               },
+               "sfgDependentFields": {
+                       "value": []
+               },
+               "sfgCheckboxesSelectAllMinimum": {
+                       "value": 10
+               },
                "sfgDatePickerSettings": {
-                       "@note": "See SF_DefaultInputSettings.php for allowed 
values",
-                       "FirstDate": null,
-                       "LastDate": null,
-                       "DateFormat": "SHORT",
-                       "WeekStart": null,
-                       "ShowWeekNumbers": false,
-                       "DisableInputField": false,
-                       "ShowResetButton": false,
-                       "DisabledDaysOfWeek": null,
-                       "HighlightedDaysOfWeek": null,
-                       "DisabledDates": null,
-                       "HighlightedDates": null
+                       "value": {
+                               "@note": "See SF_DefaultInputSettings.php for 
allowed values",
+                               "FirstDate": null,
+                               "LastDate": null,
+                               "DateFormat": "SHORT",
+                               "WeekStart": null,
+                               "ShowWeekNumbers": false,
+                               "DisableInputField": false,
+                               "ShowResetButton": false,
+                               "DisabledDaysOfWeek": null,
+                               "HighlightedDaysOfWeek": null,
+                               "DisabledDates": null,
+                               "HighlightedDates": null
+                       },
+                       "merge_strategy": "array_plus"
                }
        },
-       "manifest_version": 1
+       "config_prefix": "",
+       "manifest_version": 2
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/303823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64cbb7cb04ef62b50efb52e49954cf47b78cb768
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to