diff --git a/app/views/news_mailer/neuigkeit_mail.html.erb b/app/views/news_mailer/neuigkeit_mail.html.erb index 5518dd4..b66792b 100644 --- a/app/views/news_mailer/neuigkeit_mail.html.erb +++ b/app/views/news_mailer/neuigkeit_mail.html.erb @@ -7,5 +7,7 @@ <%= content_tag(:img,"",src: "http://"+ActionMailer::Base.default_url_options[:host].to_s+@neuigkeit.picture.big_thumb.url) %> <%=url_for controller: "neuigkeiten",action: :show, :id=>@neuigkeit.id, only_path: false %> <%= raw(@neuigkeit.text) %> -<%= render partial:"survey/questions/mail", object: @neuigkeit.questions.first unless @neuigkeit.questions.empty?%> +<% @neuigkeit.questions.each do |q| %> +<%= render partial:"survey/questions/mail", object: q %> +<% end %> <%= link_to "Auf Fet.at weiterlesen", rubrik_neuigkeit_url(@neuigkeit.rubrik, @neuigkeit,:locale=>:de, :theme=>nil) %> diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index 57ef5c9..a4afc45 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -1,6 +1,6 @@ <% if current_user.nil? %> <%= div_tag_for(question) do%> - <%= render partial: "survey/questions/answeredquestion", object: question %> + <%= render partial: "survey/questions/answeredquestion", object: question unless question.flag_delete%> <% end %> <% else %>
@@ -10,16 +10,17 @@ <%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true %> <%= flag_link(question, "delete")%> <%= flag_link(question, "template")%> - + <% unless question.flag_delete %> <%= link_to "+" , new_survey_choice_path(params:{question_id: question.id}), remote: true%> + <% end %>
- <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 %> - + <%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 unless question.flag_delete %> + <% end %> diff --git a/app/views/themes/blue2/home/intern.html.erb b/app/views/themes/blue2/home/intern.html.erb index 3fdfd18..86dd73a 100644 --- a/app/views/themes/blue2/home/intern.html.erb +++ b/app/views/themes/blue2/home/intern.html.erb @@ -11,12 +11,14 @@ <%= link_to ff_icon("ffi1-setting")+"Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
  • - <%= link_to ff_icon("fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> + <%= link_to ff_icon("fa fa-folder")+"Treeview" , treeview_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
  • <%= link_to ff_icon("ffi1-newspaper9")+"Crawler" , crawler_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
  • - +
  • + <%= link_to ff_icon("ffi1-setting")+"Meetings" , meetingtyps_path, class: :linkbox if current_user.has_role?(:fetadmin) %> +

  • Suche nach Protokollen