Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376884 )

Change subject: Small code cleanup of the page quality edit widget
......................................................................

Small code cleanup of the page quality edit widget

Change-Id: I38147fea55b38180b18b625a43ae8a5bf05a766e
---
M includes/page/EditPagePage.php
1 file changed, 26 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/84/376884/1

diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
index cb9eaeb..28f19cc 100644
--- a/includes/page/EditPagePage.php
+++ b/includes/page/EditPagePage.php
@@ -11,6 +11,7 @@
 use ProofreadPage\Context;
 use ProofreadPagePage;
 use Status;
+use User;
 
 /**
  * @licence GNU GPL v2+
@@ -149,17 +150,23 @@
         * @see EditPage::getCheckboxesWidget
         */
        public function getCheckboxesWidget( &$tabindex, $checked ) {
-               $oldLevel = $this->getCurrentContent()->getLevel();
-
-               $content = $this->toEditContent( $this->textbox1 );
-               $currentLevel = $content->getLevel();
-
-               $qualityLevels = [ 0, 2, 1, 3, 4 ];
-               $html = '';
                $checkboxes = parent::getCheckboxesWidget( $tabindex, $checked 
);
                $user = $this->context->getUser();
 
-               foreach ( $qualityLevels as $level ) {
+               if ( $user->isAllowed( 'pagequality' ) ) {
+                       $checkboxes['wpr-pageStatus'] = 
$this->buildQualityEditWidget( $user, $tabindex );
+               }
+
+               return $checkboxes;
+       }
+
+       private function buildQualityEditWidget( User $user, &$tabindex ) {
+               $oldLevel = $this->getCurrentContent()->getLevel();
+               $content = $this->toEditContent( $this->textbox1 );
+               $currentLevel = $content->getLevel();
+
+               $html = '';
+               for ( $level = 0; $level <= 4; $level++ ) {
                        $newLevel = new PageLevel( $level, $user );
                        if ( !$oldLevel->isChangeAllowed( $newLevel ) ) {
                                continue;
@@ -181,22 +188,17 @@
                                Html::closeElement( 'span' );
                }
 
-               $checkboxes['wpr-pageStatus'] = new OOUI\Widget( [ 'content' => 
new OOUI\HtmlSnippet( '' ) ] );
-               if ( $user->isAllowed( 'pagequality' ) ) {
-                       $content =
-                               Html::openElement( 'span', [ 'id' => 
'wpQuality-container' ] ) .
-                               $html .
-                               Html::closeElement( 'span' ) .
-                               Html::OpenElement( 'label', [ 'for' => 
'wpQuality-container' ] ) .
-                               $this->context->msg( 
'proofreadpage_page_status' )
-                                       ->title( $this->getTitle() )->parse() .
-                               Html::closeElement( 'label' );
-                       $checkboxes['wpr-pageStatus'] = new OOUI\Widget(
-                               [ 'content' => new OOUI\HtmlSnippet( $content ) 
]
-                       );
-               }
-
-               return $checkboxes;
+               $content =
+                       Html::openElement( 'span', [ 'id' => 
'wpQuality-container' ] ) .
+                       $html .
+                       Html::closeElement( 'span' ) .
+                       Html::OpenElement( 'label', [ 'for' => 
'wpQuality-container' ] ) .
+                       $this->context->msg( 'proofreadpage_page_status' )
+                               ->title( $this->getTitle() )->parse() .
+                       Html::closeElement( 'label' );
+               return new OOUI\Widget(
+                       [ 'content' => new OOUI\HtmlSnippet( $content ) ]
+               );
        }
 
        /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38147fea55b38180b18b625a43ae8a5bf05a766e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to