Merge pull request #5272 from dodona-edu/fix/labels-disappear

Fix user label disappearing on global feedback update

app/controllers/feedbacks_controller.rb

@@ -23,13 +23,6 @@ def show
     ]
     @title = I18n.t('feedbacks.show.feedback')
 
-    @user_labels = @feedback.evaluation
-                            .series
-                            .course
-                            .course_memberships
-                            .find_by(user_id: @feedback.user)
-                            .course_labels
-
     @score_map = @feedback.scores.index_by(&:score_item_id)
     # If we refresh all scores because of a conflict, we want to make
     # sure the user is aware the update was not successful. By setting

app/models/feedback.rb

@@ -85,6 +85,15 @@ def maximum_score
     mapped.sum if mapped.any?
   end
 
+  def user_labels
+    evaluation
+      .series
+      .course
+      .course_memberships
+      .find_by(user_id: user)
+      .course_labels
+  end
+
   private
 
   def determine_submission

app/views/feedbacks/_feedback_actions.html.erb

@@ -114,13 +114,13 @@
   </div>
   <div class="username-row">
     <h4 class="ellipsis-overflow name" title="<%= @feedback.user.full_name %>"><%= @feedback.user.full_name %></h4>
-    <% if @user_labels.present? %>
-        <span class="token accent-orange" title="<%= @user_labels.first.name %>"><%= @user_labels.first.name %></span>
+    <% if @feedback.user_labels.present? %>
+        <span class="token accent-orange" title="<%= @feedback.user_labels.first.name %>"><%= @feedback.user_labels.first.name %></span>
     <% end %>
   </div>
-  <% if @user_labels.present? && @user_labels.length > 1 %>
+  <% if @feedback.user_labels.present? && @feedback.user_labels.length > 1 %>
     <div class="labels-row">
-      <% @user_labels[1..].each do |label| %>
+      <% @feedback.user_labels[1..].each do |label| %>
         <span class="token accent-orange" title="<%= label.name %>"><%= label.name %></span>
       <% end %>
     </div>