Fix emergency link feature and made "You need further help? ..." invi…

…sible if no link was entered by the teacher.
MaMpf-HD · Sep 17, 2023 · 22bd9cc · 22bd9cc
1 parent 8f82640
commit 22bd9cc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
@@ -333,7 +333,9 @@ def lecture_params
                         :organizational_concept, :muesli,
                         :organizational_on_top, :disable_teacher_display,
                         :content_mode, :passphrase, :sort, :comments_disabled,
-                        :submission_max_team_size, :submission_grace_period]
+                        :submission_max_team_size, :submission_grace_period,
+                        :annotations_status, :emergency_link,
+                        :emergency_link_status]
       if action_name == 'update' && current_user.can_update_personell?(@lecture)
         allowed_params.concat([:teacher_id, editor_ids: []])
       end

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
@@ -59,7 +59,7 @@ class Lecture < ApplicationRecord
   # in the erdbeere database
   serialize :structure_ids, Array
 
-  # if the emergency button is enabled one can add different types of links
+  # if the emergency button is enabled, one can add different types of links
   # that e.g. bring students to the helpdesk
   enum emergency_link_status: { no_link: 0, lecture_link: 1, direct_link: 2 }
 

diff --git a/app/views/annotations/_form_content_definition.html.erb b/app/views/annotations/_form_content_definition.html.erb
@@ -7,6 +7,8 @@
 	<% elsif status == "direct_link" %>
     <% link_name = link %>
   <% end %>
-  <%= t('admin.annotation.further_help') %> <br>
-	<a href="<%= link %>"><%= link_name %></a>
-</div>
+  <% unless link_name.blank? %>
+    <%= t('admin.annotation.further_help') %> <br>
+	  <a href="<%= link %>"><%= link_name %></a>
+	<% end %>
+</div>
diff --git a/app/views/lectures/edit/_preferences.html.erb b/app/views/lectures/edit/_preferences.html.erb
@@ -192,21 +192,21 @@
                 </div>
               </div>
             </div>
-          <% end %>
-          <div id="lecture-link-field">
-            <%= t('admin.lecture.select_helpdesk') %>
-            <%= f.select :lecture_link,
-                         options_for_select(Lecture.all.map { |l| [l.title, l.lecture_path] },
-                                            [@linked_lecture&.title, @linked_lecture&.lecture_path]) %>
-          </div>
-          <div class="form-row", id="direct-link-field">
-            <div class="col-auto form-group">
-              <%= t('admin.lecture.enter_emergency_link') %>
-              <%= f.text_field :direct_link,
-                               { size: 50,
-                                 value: @direct_link } %>
+            <div id="lecture-link-field">
+              <%= t('admin.lecture.select_helpdesk') %>
+              <%= f.select :lecture_link,
+                           options_for_select(Lecture.all.map { |l| [l.title, l.lecture_path] },
+                                              [@linked_lecture&.title, @linked_lecture&.lecture_path]) %>
             </div>
-          </div>
+            <div class="form-row", id="direct-link-field">
+              <div class="col-auto form-group">
+                <%= t('admin.lecture.enter_emergency_link') %>
+                <%= f.text_field :direct_link,
+                                 { size: 50,
+                                   value: @direct_link } %>
+              </div>
+            </div>
+          <% end %>
           <div class="row">
             <div class="col-12 text-center">
               <div id="lecture-preferences-warning">