[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Use core HTMLDateTimeField
jenkins-bot has submitted this change and it was merged.
Change subject: Use core HTMLDateTimeField
..
Use core HTMLDateTimeField
Bug: T146340
Change-Id: I6558775e7759aaac5b0ec05a87d95b68f0afb747
Depends-On: Iaa8b5892b6c3a1f3698cef59684cc3cdc9d483ea
---
M SpecialApiFeatureUsage.php
M extension.json
D htmlform/HTMLDateField.php
D htmlform/HTMLDateRangeField.php
D htmlform/ext.apifeatureusage.htmlform.js
M i18n/en.json
M i18n/qqq.json
M phpcs.xml
8 files changed, 23 insertions(+), 438 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialApiFeatureUsage.php b/SpecialApiFeatureUsage.php
index 26a90c3..d965053 100644
--- a/SpecialApiFeatureUsage.php
+++ b/SpecialApiFeatureUsage.php
@@ -10,23 +10,13 @@
$this->setHeaders();
$this->checkPermissions();
- /** @todo These should be migrated to core, once the jquery.ui
-* objectors write their own date picker. */
- if ( !isset( HTMLForm::$typeMappings['date'] ) ||
- !isset( HTMLForm::$typeMappings['daterange'] )
- ) {
- HTMLForm::$typeMappings['date'] =
'ApiFeatureUsage_HTMLDateField';
- HTMLForm::$typeMappings['daterange'] =
'ApiFeatureUsage_HTMLDateRangeField';
- $this->getOutput()->addModules(
'ext.apifeatureusage.htmlform' );
- }
-
$request = $this->getRequest();
$conf = ConfigFactory::getDefaultInstance()->makeConfig(
'ApiFeatureUsage' );
$this->engine = ApiFeatureUsageQueryEngine::getEngine( $conf );
list( $start, $end ) = $this->engine->suggestDateRange();
- $form = new HTMLForm( [
+ $form = HTMLForm::factory( 'ooui', [
'agent' => [
'type' => 'text',
'default' => '',
@@ -34,17 +24,17 @@
'required' => true,
],
- 'dates' => [
- 'type' => 'daterange',
- 'label-message' =>
'apifeatureusage-dates-label',
- 'layout-message' =>
'apifeatureusage-dates-layout',
- 'absolute' => true,
+ 'startdate' => [
+ 'type' => 'date',
+ 'label-message' =>
'apifeatureusage-startdate-label',
'required' => true,
- 'allow-sameday' => true,
- 'default' => [
- $start->format( 'Y-m-d' ),
- $end->format( 'Y-m-d' ),
- ],
+ 'default' => $start->format( 'Y-m-d' ),
+ ],
+ 'enddate' => [
+ 'type' => 'date',
+ 'label-message' =>
'apifeatureusage-enddate-label',
+ 'required' => true,
+ 'default' => $end->format( 'Y-m-d' ),
],
], $this->getContext() );
$form->setMethod( 'get' );
@@ -54,7 +44,9 @@
$form->setSubmitTextMsg( 'apifeatureusage-submit' );
$form->prepareForm();
- if ( $request->getCheck( 'wpagent' ) || $request->getCheck(
'wpdates' ) ) {
+ if ( $request->getCheck( 'wpagent' ) || $request->getCheck(
'wpstartdate' ) ||
+ $request->getCheck( 'wpenddate' )
+ ) {
$status = $form->trySubmit();
} else {
$status = false;
@@ -121,8 +113,8 @@
public function onSubmit( $data, $form ) {
$agent = $data['agent'];
- $start = new MWTimestamp( $data['dates'][0] . 'T00:00:00Z' );
- $end = new MWTimestamp( $data['dates'][1] . 'T23:59:59Z' );
+ $start = new MWTimestamp( $data['startdate'] . 'T00:00:00Z' );
+ $end = new MWTimestamp( $data['enddate'] . 'T23:59:59Z' );
return $this->engine->execute( $agent, $start, $end );
}
diff --git a/extension.json b/extension.json
index 2c00f19..bdefccf 100644
--- a/extension.json
+++ b/extension.json
@@ -31,19 +31,12 @@
"ApiQueryFeatureUsage": "ApiQueryFeatureUsage.php",
"ApiFeatureUsageQueryEngine": "ApiFeatureUsageQueryEngine.php",
"ApiFeatureUsageQueryEngineElastica":
"ApiFeatureUsageQueryEngineElastica.php",
- "ApiFeatureUsageQueryEngineElasticaConnection":
"ApiFeatureUsageQueryEngineElastica.php",
-
[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Use core HTMLDateTimeField
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312289
Change subject: Use core HTMLDateTimeField
..
Use core HTMLDateTimeField
Bug: T146340
Change-Id: I6558775e7759aaac5b0ec05a87d95b68f0afb747
Depends-On: Iaa8b5892b6c3a1f3698cef59684cc3cdc9d483ea
---
M SpecialApiFeatureUsage.php
M extension.json
D htmlform/HTMLDateField.php
D htmlform/HTMLDateRangeField.php
D htmlform/ext.apifeatureusage.htmlform.js
M i18n/en.json
M i18n/qqq.json
M phpcs.xml
8 files changed, 23 insertions(+), 438 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiFeatureUsage
refs/changes/89/312289/1
diff --git a/SpecialApiFeatureUsage.php b/SpecialApiFeatureUsage.php
index 26a90c3..d965053 100644
--- a/SpecialApiFeatureUsage.php
+++ b/SpecialApiFeatureUsage.php
@@ -10,23 +10,13 @@
$this->setHeaders();
$this->checkPermissions();
- /** @todo These should be migrated to core, once the jquery.ui
-* objectors write their own date picker. */
- if ( !isset( HTMLForm::$typeMappings['date'] ) ||
- !isset( HTMLForm::$typeMappings['daterange'] )
- ) {
- HTMLForm::$typeMappings['date'] =
'ApiFeatureUsage_HTMLDateField';
- HTMLForm::$typeMappings['daterange'] =
'ApiFeatureUsage_HTMLDateRangeField';
- $this->getOutput()->addModules(
'ext.apifeatureusage.htmlform' );
- }
-
$request = $this->getRequest();
$conf = ConfigFactory::getDefaultInstance()->makeConfig(
'ApiFeatureUsage' );
$this->engine = ApiFeatureUsageQueryEngine::getEngine( $conf );
list( $start, $end ) = $this->engine->suggestDateRange();
- $form = new HTMLForm( [
+ $form = HTMLForm::factory( 'ooui', [
'agent' => [
'type' => 'text',
'default' => '',
@@ -34,17 +24,17 @@
'required' => true,
],
- 'dates' => [
- 'type' => 'daterange',
- 'label-message' =>
'apifeatureusage-dates-label',
- 'layout-message' =>
'apifeatureusage-dates-layout',
- 'absolute' => true,
+ 'startdate' => [
+ 'type' => 'date',
+ 'label-message' =>
'apifeatureusage-startdate-label',
'required' => true,
- 'allow-sameday' => true,
- 'default' => [
- $start->format( 'Y-m-d' ),
- $end->format( 'Y-m-d' ),
- ],
+ 'default' => $start->format( 'Y-m-d' ),
+ ],
+ 'enddate' => [
+ 'type' => 'date',
+ 'label-message' =>
'apifeatureusage-enddate-label',
+ 'required' => true,
+ 'default' => $end->format( 'Y-m-d' ),
],
], $this->getContext() );
$form->setMethod( 'get' );
@@ -54,7 +44,9 @@
$form->setSubmitTextMsg( 'apifeatureusage-submit' );
$form->prepareForm();
- if ( $request->getCheck( 'wpagent' ) || $request->getCheck(
'wpdates' ) ) {
+ if ( $request->getCheck( 'wpagent' ) || $request->getCheck(
'wpstartdate' ) ||
+ $request->getCheck( 'wpenddate' )
+ ) {
$status = $form->trySubmit();
} else {
$status = false;
@@ -121,8 +113,8 @@
public function onSubmit( $data, $form ) {
$agent = $data['agent'];
- $start = new MWTimestamp( $data['dates'][0] . 'T00:00:00Z' );
- $end = new MWTimestamp( $data['dates'][1] . 'T23:59:59Z' );
+ $start = new MWTimestamp( $data['startdate'] . 'T00:00:00Z' );
+ $end = new MWTimestamp( $data['enddate'] . 'T23:59:59Z' );
return $this->engine->execute( $agent, $start, $end );
}
diff --git a/extension.json b/extension.json
index 2c00f19..bdefccf 100644
--- a/extension.json
+++ b/extension.json
@@ -31,19 +31,12 @@
"ApiQueryFeatureUsage": "ApiQueryFeatureUsage.php",
"ApiFeatureUsageQueryEngine": "ApiFeatureUsageQueryEngine.php",
"ApiFeatureUsageQueryEngineElastica":
"ApiFeatureUsageQueryEngineElastica.php",
- "ApiFeatureUsageQueryEngineElasticaConnection":
