Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302739
Change subject: Update Wikidata - Fix PropertySuggester
......................................................................
Update Wikidata - Fix PropertySuggester
* also fix undefined property in Scribunto_LuaWikibaseLibrary
* and javascript error when adding statements
Change-Id: I91a788be10b8aaa07cfa475e6cfa642cb9d72c8b
---
M composer.json
M composer.lock
M extensions/PropertySuggester/PropertySuggester.php
M extensions/PropertySuggester/README.md
M extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js
M
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M
extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
M vendor/composer/installed.json
8 files changed, 169 insertions(+), 151 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/39/302739/1
diff --git a/composer.json b/composer.json
index 8228f44..ab431fa 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"require": {
"php": ">=5.5.0",
"mediawiki/article-placeholder": "dev-master",
- "propertysuggester/property-suggester": "~3.0.0",
+ "propertysuggester/property-suggester": "~3.1.0",
"wikibase/wikibase": "dev-wmf/1.28.0-wmf.13",
"wikibase/wikimedia-badges": "dev-master",
"wikibase/Wikidata.org": "dev-master",
@@ -65,4 +65,4 @@
"merge-dev": false
}
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index a84d2cd..cce31df 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "bf0f837be2fad3d314a13c4b135d155f",
- "content-hash": "742959d188ded1d14eaca15293f93fcc",
+ "hash": "d03aedcfc08452204892e00a93dff6fc",
+ "content-hash": "86dfcb928ce545a97f7e65e7d53ee9f2",
"packages": [
{
"name": "composer/installers",
@@ -816,16 +816,16 @@
},
{
"name": "propertysuggester/property-suggester",
- "version": "3.0.4",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/Wikidata-lib/PropertySuggester.git";,
- "reference": "f91700287902411d5e990e734b0e7ee108599e91"
+ "reference": "dab96c4876a959f7b81ed859c380e53f8c41fe26"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/Wikidata-lib/PropertySuggester/zipball/f91700287902411d5e990e734b0e7ee108599e91";,
- "reference": "f91700287902411d5e990e734b0e7ee108599e91",
+ "url":
"https://api.github.com/repos/Wikidata-lib/PropertySuggester/zipball/dab96c4876a959f7b81ed859c380e53f8c41fe26";,
+ "reference": "dab96c4876a959f7b81ed859c380e53f8c41fe26",
"shasum": ""
},
"require": {
@@ -859,7 +859,7 @@
"wikibase",
"wikidata"
],
- "time": "2016-08-01 17:20:08"
+ "time": "2016-08-03 16:19:13"
},
{
"name": "serialization/serialization",
@@ -1457,12 +1457,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "e6f596ddd767683c5040f1843c1f71e0065601b7"
+ "reference": "450ba1ae02e1a76e4ea3f18d23f31c648e5d7715"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e6f596ddd767683c5040f1843c1f71e0065601b7";,
- "reference": "e6f596ddd767683c5040f1843c1f71e0065601b7",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/450ba1ae02e1a76e4ea3f18d23f31c648e5d7715";,
+ "reference": "450ba1ae02e1a76e4ea3f18d23f31c648e5d7715",
"shasum": ""
},
"require": {
@@ -1534,7 +1534,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-08-02 16:13:20"
+ "time": "2016-08-03 16:00:49"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/PropertySuggester/PropertySuggester.php
b/extensions/PropertySuggester/PropertySuggester.php
index 459a45f..13b2732 100644
--- a/extensions/PropertySuggester/PropertySuggester.php
+++ b/extensions/PropertySuggester/PropertySuggester.php
@@ -9,7 +9,7 @@
return;
}
-define( 'PropertySuggester_VERSION', '3.0.4' );
+define( 'PropertySuggester_VERSION', '3.1.0' );
if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
require_once __DIR__ . '/vendor/autoload.php';
diff --git a/extensions/PropertySuggester/README.md
b/extensions/PropertySuggester/README.md
index b54fff6..463a867 100644
--- a/extensions/PropertySuggester/README.md
+++ b/extensions/PropertySuggester/README.md
@@ -45,6 +45,9 @@
## Release notes
+### 3.1.0 (2016-08-03)
+* Adapted entity suggester for changes in Wikibase.
+
### 3.0.2 (2016-06-20)
* Adapt entity type for namespaces
* Minor cleanups
diff --git
a/extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js
b/extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js
index c740b00..8463229 100644
---
a/extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js
+++
b/extensions/PropertySuggester/modules/ext.PropertySuggester.EntitySelector.js
@@ -41,7 +41,7 @@
* @param {string} term
* @return {Object}
*/
- _getData: function( term ) {
+ _getSearchApiParameters: function( term ) {
var self = this;
if( !self._useSuggester() ) {
diff --git
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index af1221f..6b1a57d 100644
---
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -79,6 +79,11 @@
private $entityIdParser = null;
/**
+ * @var RepoLinker|null
+ */
+ private $repoLinker = null;
+
+ /**
* @return WikibaseLuaBindings
*/
private function getLuaBindings() {
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
index 7f4a6ce..a5b0242 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
@@ -325,6 +325,11 @@
var $subToolbar = this.getContainer().children(
':wikibase-toolbar' ),
subToolbar = $subToolbar.data( 'toolbar' );
+ // This may happen while "Saving..." is shown.
+ if ( !subToolbar ) {
+ return;
+ }
+
var $buttons = this.getButton( 'save' ).element;
if ( $.isFunction( this.options.onRemove ) ) {
$buttons = $buttons.add( this.getButton( 'remove'
).element );
@@ -360,6 +365,11 @@
var $subToolbar = this.getContainer().children(
':wikibase-toolbar' ),
subToolbar = $subToolbar.data( 'toolbar' );
+ // This may happen while "Saving..." is shown.
+ if ( !subToolbar ) {
+ return;
+ }
+
subToolbar.option( '$content', this.getButton( 'edit' ).element
);
this.getContainer().removeClass( this.widgetBaseClass +
'-ineditmode' );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3f80b8b..c974f09 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1342,93 +1342,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.28.0-wmf.13",
- "version_normalized": "dev-wmf/1.28.0-wmf.13",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "e6f596ddd767683c5040f1843c1f71e0065601b7"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e6f596ddd767683c5040f1843c1f71e0065601b7";,
- "reference": "e6f596ddd767683c5040f1843c1f71e0065601b7",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.3.0",
- "data-values/data-types": "~0.5.0",
- "data-values/data-values": "~1.0",
- "data-values/geo": "~1.0",
- "data-values/interfaces": "~0.2.0|~0.1.5",
- "data-values/javascript": "~0.8.0",
- "data-values/number": "~0.7.0",
- "data-values/serialization": "~1.1",
- "data-values/time": "~0.8.4",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.17.3",
- "diff/diff": "~2.0",
- "php": ">=5.5.0",
- "wikibase/data-model": "~6.0",
- "wikibase/data-model-javascript": "~2.0.0",
- "wikibase/data-model-serialization": "~2.2",
- "wikibase/data-model-services": "~3.5",
- "wikibase/internal-serialization": "~2.3",
- "wikibase/javascript-api": "~1.1",
- "wikibase/serialization-javascript": "~2.0.5",
- "wikimedia/purtle": "~1.0"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.25"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
- },
- "time": "2016-08-02 16:13:20",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/MockClientStore.php",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/maintenance/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
- "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
- "Wikibase\\View\\": "view/src",
- "Wikibase\\View\\Tests\\": "view/tests/phpunit"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ]
- },
- {
"name": "wikibase/wikimedia-badges",
"version": "dev-master",
"version_normalized": "9999999-dev",
@@ -1525,55 +1438,6 @@
"support": {
"irc": "irc://irc.freenode.net/wikidata"
}
- },
- {
- "name": "propertysuggester/property-suggester",
- "version": "3.0.4",
- "version_normalized": "3.0.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/Wikidata-lib/PropertySuggester.git";,
- "reference": "f91700287902411d5e990e734b0e7ee108599e91"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/Wikidata-lib/PropertySuggester/zipball/f91700287902411d5e990e734b0e7ee108599e91";,
- "reference": "f91700287902411d5e990e734b0e7ee108599e91",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.0",
- "wikibase/data-model": "~4.1|~5.0|~6.0",
- "wikibase/data-model-services": "~1.1|~2.0|~3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "3.7.*",
- "satooshi/php-coveralls": "dev-master"
- },
- "time": "2016-08-01 17:20:08",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "PropertySuggester\\": "src/PropertySuggester/"
- },
- "files": [],
- "classmap": [
- "PropertySuggesterHooks.php",
- "maintenance/UpdateTable.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "description": "Extension for Wikibase to provide usefull suggestions
for new properties",
- "homepage": "https://github.com/Wikidata-lib/PropertySuggester";,
- "keywords": [
- "propertysuggester",
- "wikibase",
- "wikidata"
- ]
},
{
"name": "wikibase/quality",
@@ -1689,5 +1553,141 @@
"support": {
"issues": "https://phabricator.wikimedia.org/project/profile/1202/";
}
+ },
+ {
+ "name": "propertysuggester/property-suggester",
+ "version": "3.1.0",
+ "version_normalized": "3.1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Wikidata-lib/PropertySuggester.git";,
+ "reference": "dab96c4876a959f7b81ed859c380e53f8c41fe26"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/Wikidata-lib/PropertySuggester/zipball/dab96c4876a959f7b81ed859c380e53f8c41fe26";,
+ "reference": "dab96c4876a959f7b81ed859c380e53f8c41fe26",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.0",
+ "wikibase/data-model": "~4.1|~5.0|~6.0",
+ "wikibase/data-model-services": "~1.1|~2.0|~3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "3.7.*",
+ "satooshi/php-coveralls": "dev-master"
+ },
+ "time": "2016-08-03 16:19:13",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "PropertySuggester\\": "src/PropertySuggester/"
+ },
+ "files": [],
+ "classmap": [
+ "PropertySuggesterHooks.php",
+ "maintenance/UpdateTable.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "description": "Extension for Wikibase to provide usefull suggestions
for new properties",
+ "homepage": "https://github.com/Wikidata-lib/PropertySuggester";,
+ "keywords": [
+ "propertysuggester",
+ "wikibase",
+ "wikidata"
+ ]
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.28.0-wmf.13",
+ "version_normalized": "dev-wmf/1.28.0-wmf.13",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "450ba1ae02e1a76e4ea3f18d23f31c648e5d7715"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/450ba1ae02e1a76e4ea3f18d23f31c648e5d7715";,
+ "reference": "450ba1ae02e1a76e4ea3f18d23f31c648e5d7715",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.3.0",
+ "data-values/data-types": "~0.5.0",
+ "data-values/data-values": "~1.0",
+ "data-values/geo": "~1.0",
+ "data-values/interfaces": "~0.2.0|~0.1.5",
+ "data-values/javascript": "~0.8.0",
+ "data-values/number": "~0.7.0",
+ "data-values/serialization": "~1.1",
+ "data-values/time": "~0.8.4",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.17.3",
+ "diff/diff": "~2.0",
+ "php": ">=5.5.0",
+ "wikibase/data-model": "~6.0",
+ "wikibase/data-model-javascript": "~2.0.0",
+ "wikibase/data-model-serialization": "~2.2",
+ "wikibase/data-model-services": "~3.5",
+ "wikibase/internal-serialization": "~2.3",
+ "wikibase/javascript-api": "~1.1",
+ "wikibase/serialization-javascript": "~2.0.5",
+ "wikimedia/purtle": "~1.0"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.25"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
+ },
+ "time": "2016-08-03 16:00:49",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/MockClientStore.php",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/maintenance/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
+ "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
+ "Wikibase\\View\\": "view/src",
+ "Wikibase\\View\\Tests\\": "view/tests/phpunit"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/302739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91a788be10b8aaa07cfa475e6cfa642cb9d72c8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.28.0-wmf.13
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
