Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/215304
Change subject: Only show mark as exception link if user has permission to do
that
......................................................................
Only show mark as exception link if user has permission to do that
Conflicts:
includes/Violations/CrossCheckViolationContext.php
Change-Id: Ic2a3b6d8bd379c154e8d6fffe414c7e2adb49af5
---
M includes/Violations/CrossCheckViolationContext.php
1 file changed, 11 insertions(+), 9 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/04/215304/1
diff --git a/includes/Violations/CrossCheckViolationContext.php
b/includes/Violations/CrossCheckViolationContext.php
index b6a0e93..70d182a 100755
--- a/includes/Violations/CrossCheckViolationContext.php
+++ b/includes/Violations/CrossCheckViolationContext.php
@@ -230,10 +230,11 @@
/**
* @param Violation $violation
+ * @param bool $permissionStatus
* @throws InvalidArgumentException
* @return string
*/
- public function getLongMessage( Violation $violation ) {
+ public function getLongMessage( Violation $violation, $permissionStatus ) {
if ( !$this->isContextFor( $violation ) ) {
throw new InvalidArgumentException( 'The given violation is not
supported by this context.' );
}
@@ -243,7 +244,7 @@
$additionalInfo = $violation->getAdditionalInfo();
$externalValues = $this->formatExternalValues( $additionalInfo );
- return $this->buildLongMessage( $additionalInfo, $dataSource,
$externalValues );
+ return $this->buildLongMessage( $additionalInfo, $dataSource,
$externalValues, $permissionStatus );
}
/**
@@ -252,9 +253,10 @@
* @param array $additionalInfo
* @param string $dataSource
* @param string $externalValues
+ * @param bool $canMarkAsException
* @return string
*/
- private function buildLongMessage( array $additionalInfo, $dataSource,
$externalValues ) {
+ private function buildLongMessage( array $additionalInfo, $dataSource,
$externalValues, $canMarkAsException ) {
$message =
'<span class="wbq-long-message-headline">'
@@ -262,7 +264,6 @@
->params( $dataSource )
->text()
. '</span>';
-
if( $externalValues ) {
$message .= Html::element( 'br' );
$message .= wfMessage(
'wbqev-violation-long-message-external-values' )
@@ -274,11 +275,12 @@
$message .= wfMessage( 'wbqev-violation-long-message-solve-issue'
)->text();
$message .= Html::element( 'br' );
- $message .=
- '<div class="wbq-container-mark-as-exception"><a href=""
class="wbq-mark-as-exception">'
- . wfMessage( 'wbq-violations-mark-as-exception' )->text()
- . '</a></div>';
-
+ if ( $canMarkAsException ) {
+ $message .=
+ '<div class="wbq-container-mark-as-exception"><a href=""
class="wbq-mark-as-exception">'
+ . wfMessage('wbq-violations-mark-as-exception')->text()
+ . '</a></div>';
+ }
return $message;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/215304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2a3b6d8bd379c154e8d6fffe414c7e2adb49af5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Dominic.sauer <dominic.sa...@yahoo.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
