diff options
| author | Fabrice Bellingard <bellingard@gmail.com> | 2012-02-06 18:04:39 +0100 |
|---|---|---|
| committer | Fabrice Bellingard <bellingard@gmail.com> | 2012-02-06 18:04:39 +0100 |
| commit | 6a174837516ec2457f881e30c2cd4ee3468455cb (patch) | |
| tree | db3677e22f8058b5d54a54827dc6008cc29906cb /sonar-server | |
| parent | 197236c22bb4cddf38230a5ba3424a6d2c7610aa (diff) | |
| download | sonarqube-6a174837516ec2457f881e30c2cd4ee3468455cb.tar.gz sonarqube-6a174837516ec2457f881e30c2cd4ee3468455cb.zip | |
SONAR-3223 Err. in review search if result ties to a deleted resource
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb | 10 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_list.html.erb | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb index 2b4e3edd658..14e22c06400 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_reviews/_review.html.erb @@ -123,7 +123,11 @@ <%= qualifier_icon(review.resource) -%> <% if !review.on_project? %> <%= review.project.long_name -%> <%= image_tag 'sep12.png' -%> <% end %> - <%= link_to_resource(review.resource, review.resource.long_name, {:tab => :violations, :rule => review.false_positive ? "false_positive_reviews" : ""}) %> + <% if review.rule_failure && review.rule_failure.snapshot %> + <%= link_to_resource(review.resource, review.resource.long_name, {:tab => :violations, :rule => review.false_positive ? "false_positive_reviews" : ""}) %> + <% else %> + <%= review.resource.long_name -%> + <% end %> </td> </tr> </table> @@ -134,6 +138,7 @@ </div> <% end %> + <% if review.rule_failure || !review.comments.empty? %> <div class="discussion marginbottom10"> <% if review.rule_failure %> <div class="discussionComment first"> @@ -182,8 +187,9 @@ </div> <% end %> </div> + <% end %> - <% if current_user %> + <% if current_user && !review.closed? %> <%= button_to_remote message('reviews.comment'), { :url => {:controller => "project_reviews", :action => "comment_form", :id => review.id}, diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_list.html.erb index d41b13667bf..11d75bcb534 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_list.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_list.html.erb @@ -59,7 +59,7 @@ <td> <span class="nowrap"><%= review.project.name -%></span> <br/> - <span class="note"><%= review.resource.name -%></span></td> + <span class="note"><%= review.resource.name if review.resource -%></span></td> <td><%= review.assignee ? h(review.assignee.name) : '-' -%></td> <td><%= distance_of_time_in_words_to_now(review.updated_at) -%></td> </tr> |