jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339432 )
Change subject: Fixups to OOUI conversion of SpecialModifyEntity and subclasses
......................................................................
Fixups to OOUI conversion of SpecialModifyEntity and subclasses
Bug: T48248
Change-Id: Idb787f7bd24036eaabe48acccb6c84b1a81c58ad
---
M repo/includes/Specials/SpecialModifyTerm.php
M tests/browser/features/support/modules/special_modify_entity_module.rb
M tests/browser/features/support/modules/special_modify_term_module.rb
M tests/browser/features/support/pages/special_set_label_page.rb
4 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Ricordisamoa: Looks good to me, but someone else must approve
Ladsgroup: Looks good to me, approved
WMDE-Fisch: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/repo/includes/Specials/SpecialModifyTerm.php
b/repo/includes/Specials/SpecialModifyTerm.php
index 2f75cc3..860d006 100644
--- a/repo/includes/Specials/SpecialModifyTerm.php
+++ b/repo/includes/Specials/SpecialModifyTerm.php
@@ -186,14 +186,16 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-value',
'type' => 'text',
- 'default' => $this->getRequest()->getVal( 'value' ) ?
$this->getRequest()->getVal( 'value' ) : $this->value,
+ 'default' => $this->getRequest()->getVal( 'value' ) ?:
$this->value,
'nodata' => true
);
$languageName = Language::fetchLanguageName(
$this->languageCode, $this->getLanguage()->getCode() );
if ( $entity !== null && $this->languageCode !== null &&
$languageName !== '' ) {
- // Messages: wikibase-setlabel-introfull,
wikibase-setdescription-introfull,
+ // Messages:
+ // wikibase-setlabel-introfull
+ // wikibase-setdescription-introfull
// wikibase-setaliases-introfull
$intro = $this->msg(
'wikibase-' . strtolower( $this->getName() ) .
'-introfull',
@@ -219,7 +221,9 @@
'value' => $valueinput
);
} else {
- // Messages: wikibase-setlabel-intro,
wikibase-setdescription-intro,
+ // Messages:
+ // wikibase-setlabel-intro
+ // wikibase-setdescription-intro
// wikibase-setaliases-intro
$intro = $this->msg( 'wikibase-' . strtolower(
$this->getName() ) . '-intro' )->parse();
$formDescriptor = $this->getFormElements( $entity );
@@ -231,7 +235,9 @@
'cssclass' => 'wb-input',
'id' => 'wb-modifyterm-language'
);
- // Messages: wikibase-setlabel-label,
wikibase-setdescription-label,
+ // Messages:
+ // wikibase-setlabel-label
+ // wikibase-setdescription-label
// wikibase-setaliases-label
$valueinput['label-message'] = 'wikibase-' .
strtolower( $this->getName() ) . '-label';
$formDescriptor['value'] = $valueinput;
diff --git
a/tests/browser/features/support/modules/special_modify_entity_module.rb
b/tests/browser/features/support/modules/special_modify_entity_module.rb
index 9d6c024..8b21fd4 100644
--- a/tests/browser/features/support/modules/special_modify_entity_module.rb
+++ b/tests/browser/features/support/modules/special_modify_entity_module.rb
@@ -11,5 +11,5 @@
p(:anonymous_edit_warning, class: 'warning')
p(:error_message, class: 'error')
- text_field(:id_input_field, css: 'div.wb-input#wb-modifyentity-id
input.oo-ui-inputWidget-input')
+ text_field(:id_input_field, css: '#wb-modifyentity-id
.oo-ui-inputWidget-input')
end
diff --git
a/tests/browser/features/support/modules/special_modify_term_module.rb
b/tests/browser/features/support/modules/special_modify_term_module.rb
index 010be0c..a896aed 100644
--- a/tests/browser/features/support/modules/special_modify_term_module.rb
+++ b/tests/browser/features/support/modules/special_modify_term_module.rb
@@ -10,6 +10,6 @@
include PageObject
include SpecialModifyEntityModule
- text_field(:language_input_field, css: 'div.wb-input#wb-modifyterm-language
input.oo-ui-inputWidget-input')
- text_field(:term_input_field, css: 'div.wb-input#wb-modifyterm-value
input.oo-ui-inputWidget-input')
+ text_field(:language_input_field, css: '#wb-modifyterm-language
.oo-ui-inputWidget-input')
+ text_field(:term_input_field, css: '#wb-modifyterm-value
.oo-ui-inputWidget-input')
end
diff --git a/tests/browser/features/support/pages/special_set_label_page.rb
b/tests/browser/features/support/pages/special_set_label_page.rb
index abf7377..ced35df 100644
--- a/tests/browser/features/support/pages/special_set_label_page.rb
+++ b/tests/browser/features/support/pages/special_set_label_page.rb
@@ -12,5 +12,5 @@
page_url URL.repo_url('Special:SetLabel')
- button(:set_label_button, css: 'div.mw-htmlform-submit#wb-setlabel-submit
button.oo-ui-buttonElement-button')
+ button(:set_label_button, css: '#wb-setlabel-submit
.oo-ui-buttonElement-button')
end
--
To view, visit https://gerrit.wikimedia.org/r/339432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb787f7bd24036eaabe48acccb6c84b1a81c58ad
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <aleksey.bekh-iva...@wikimedia.de>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Ricordisamoa <ricordisa...@openmailbox.org>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
