Allow admins to see reviews without reviewing

bd808 · bd808 · commit cf4be3997065 · 2014-09-29T09:38:22.000-06:00
If there is no review by the admin then the section for reviews by
others will be collapsed by default. A happy medium solution.
diff --git a/data/templates/proposals/view_reviews.html b/data/templates/proposals/view_reviews.html
@@ -76,10 +76,9 @@ <h3 class="panel-title">{{ ( 'review-' ~ crit )|message }}
     <div class="panel-heading">
       <h2 class="panel-title">
         {{ 'proposal-summary'|message }}
-        <a class="accordion-toggle" data-toggle="collapse" href="#summary-body"></a>
-      </h2>
+        <a class="accordion-toggle {% if myreview is empty %}collapsed{% endif %}" data-toggle="collapse" href="#summary-body"></a> </h2>
     </div>
-    <div id="summary-body" class="panel-body panel-collapse collapse in">
+    <div id="summary-body" class="panel-body panel-collapse collapse {% if myreview is not empty %}in{% endif %}">
       <dl class="dl-horizontal">
         <dt>{{ 'summary-list-reviewers'|message }}</dt>
         <dd><ul class="list-inline">
diff --git a/src/Controllers/Proposals/View.php b/src/Controllers/Proposals/View.php
@@ -47,16 +47,21 @@ protected function handleGet( $id ) {
 		$this->view->setData( 'proposal', $proposal );
 
 		if ( $this->authManager->isReviewer() ) {
-			// Reviewers can only see reviews after they have reviewed
-			// a proposal themselves
 			$myReview = $this->reviewsDao->reviewByUser( $id );
 			if ( $myReview ) {
 				$this->view->setData( 'myreview', $myReview );
-				$this->addReviewsToView( $id );
 			} else {
 				$this->view->setData( 'myreview', array() );
 			}
+
+			// Reviewers can only see reviews after they have reviewed
+			// the proposal themselves or if they are also an admin
+			if ( $myReview || $this->authManager->isAdmin() ) {
+				$this->addReviewsToView( $id );
+			}
 		} else {
+			// Non-reviewers always see reviews. The template is responsible for
+			// showing/hiding information based on the user's permissions.
 			$this->addReviewsToView( $id );
 		}
 
