Pwirth has submitted this change and it was merged.
Change subject: Review: Fixed comment issue added new icon
..
Review: Fixed comment issue added new icon
* Fixed a bug where the user got displayed the wrong comment
* Added icon for 'active' state
PatchSet 2:
* Fixed overview message for 'state' column
* Added data-bs-* attributes
Change-Id: I9c6ea901be6cab7e668023415a689b25d9abd40a
---
M Review/Review.class.php
M Review/i18n/de.json
M Review/i18n/en.json
M Review/i18n/qqq.json
M Review/includes/specials/SpecialReview.class.php
M Review/resources/BS.Review/OverviewPanel.js
M Review/resources/bluespice.review.css
A Review/resources/images/bs-infobar-workflow-active.png
A Review/resources/images/bs-infobar-workflow-active_sprite.png
9 files changed, 79 insertions(+), 22 deletions(-)
Approvals:
Tweichart: Looks good to me, but someone else must approve
Pwirth: Verified; Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 3ea4dff..ea9f4a7 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -777,6 +777,8 @@
/**
* Hook-Handler for Hook 'BSStateBarBeforeTopViewAdd'
* @param StateBar $oStateBar
+* @param User $oUser
+* @param Title $oTitle
* @param array $aTopViews
* @return boolean Always true to keep hook running
*/
@@ -810,6 +812,15 @@
}
}
}
+
+ $aNextUsers = $oRev-getNextUsers();
+ foreach( $aNextUsers as $aNextUser ) {
+ if( (int)$aNextUser['id'] === $oUser-getId() )
{
+ $sIcon = bs-infobar-workflow-active;
+ break;
+ }
+ }
+
$sIcon .= .png;
$aTopViews['statebartopreview'] =
$this-makeStateBarTopReview($sIcon);
@@ -960,7 +971,7 @@
$oReviewView-setVotable( true );
$sUserName = BsCore::getUserDisplayName($oUser);
- $oReviewView-setComment( em{$sUserName}:/em
{$_step-comment} );
+ $oReviewView-setComment( em{$sUserName}:/em
{$step-comment} );
wfRunHooks('BsReview::checkStatus::afterMessage', array($step,
$oReviewView));
if ( $oTitle-userCan( workflowview, $oUser ) ) {
diff --git a/Review/i18n/de.json b/Review/i18n/de.json
index 82391c3..0dea3af 100644
--- a/Review/i18n/de.json
+++ b/Review/i18n/de.json
@@ -15,6 +15,7 @@
bs-review-denied-disagreed: Mindestens einer der Beteiligten hat
abgelehnt.,
bs-review-accepted: Akzeptiert,
bs-review-rejected: Abgelehnt,
+ bs-review-pending: In Arbeit,
bs-review-abstain: Enthalten,
bs-review-review-finished: Diese Seite wurde begutachtet.,
bs-review-reviewed-till: Diese Seite wird von $1 bis $2
begutachtet.,
diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index 9ad0e02..50cea49 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -13,6 +13,7 @@
bs-review-denied-disagreed: At least one participant has disagreed.,
bs-review-accepted: Accepted,
bs-review-rejected: Rejected,
+ bs-review-pending: Pending,
bs-review-abstain: Abstained,
bs-review-review-finished: This page has been reviewed.,
bs-review-reviewed-till: This page is being reviewed from $1 to $2.,
diff --git a/Review/i18n/qqq.json b/Review/i18n/qqq.json
index e4256b6..85d0d08 100644
--- a/Review/i18n/qqq.json
+++ b/Review/i18n/qqq.json
@@ -19,6 +19,7 @@
bs-review-denied-disagreed: Error message that at least one
participant has disagreed on a review.,
bs-review-accepted: Text message that a number of reviewer has
accepted the review.\n*$1 is the number of users which have
accepted\n{{Identical|Accepted}},
bs-review-rejected: Text message that a number of reviewer has
rejected the review.\n*$1 is the number of users which have
rejected\n{{Identical|Rejected}},
+ bs-review-pending: Text message that a review is not yet finished.,
bs-review-abstain: Text message that a number of reviewer has
abstained the review.\n*$1 is the number of users which have
abstained\n{{Identical|Abstained}},
bs-review-review-finished: Success message that this page has been
reviewed.,
bs-review-reviewed-till: Text message that this page is being
reviewed for some time.\n*$1 is the start date\n*$2 is the end date,
diff --git a/Review/includes/specials/SpecialReview.class.php
b/Review/includes/specials/SpecialReview.class.php
index 9f7db29..6c645e8 100644
--- a/Review/includes/specials/SpecialReview.class.php
+++
