\n#{ - parent.body - }\n\n" if [:q, - :b].include? @commontator_thread.config.comment_reply_style +module Commontator + class CommentsController < Commontator::ApplicationController + before_action :set_thread, only: [:new, :create] + before_action :set_comment_and_thread, except: [:new, :create] + before_action :commontator_set_thread_variables, + only: [:show, :update, :delete, :undelete] + + # GET /comments/1 + def show + respond_to do |format| + format.html { redirect_to commontable_url } + format.js + end end - security_transgression_unless @comment.can_be_created_by?(@commontator_user) - respond_to do |format| - format.html { redirect_to commontable_url } - format.js - end - end - - # POST /threads/1/comments - def create - @comment = Commontator::Comment.new( - thread: @commontator_thread, creator: @commontator_user, body: params.dig( - :comment, :body - ) - ) - parent_id = params.dig(:comment, :parent_id) - @comment.parent = Commontator::Comment.find(parent_id) unless parent_id.blank? - security_transgression_unless @comment.can_be_created_by?(@commontator_user) - - respond_to do |format| - if params[:cancel].blank? - if @comment.save - sub = @commontator_thread.config.thread_subscription.to_sym - @commontator_thread.subscribe(@commontator_user) if sub == :a || sub == :b - subscribe_mentioned if @commontator_thread.config.mentions_enabled - Commontator::Subscription.comment_created(@comment) - # The next line constitutes a customization of the original controller - update_unread_status - - @commontator_page = @commontator_thread.new_comment_page( - @comment.parent_id, @commontator_show_all - ) - - format.js - else - format.js { render :new } + # GET /threads/1/comments/new + def new + @comment = Commontator::Comment.new(thread: @commontator_thread, + creator: @commontator_user) + parent_id = params.dig(:comment, :parent_id) + if parent_id.present? + parent = Commontator::Comment.find(parent_id) + @comment.parent = parent + if [:q, + :b].include?(@commontator_thread.config.comment_reply_style) + @comment.body = "
\n#{ + parent.body + }\n\n" end - else - format.js { render :cancel } end + security_transgression_unless(@comment.can_be_created_by?(@commontator_user)) - format.html { redirect_to commontable_url } + respond_to do |format| + format.html { redirect_to commontable_url } + format.js + end end - end - # GET /comments/1/edit - def edit - @comment.editor = @commontator_user - security_transgression_unless @comment.can_be_edited_by?(@commontator_user) + # GET /comments/1/edit + def edit + @comment.editor = @commontator_user + security_transgression_unless(@comment.can_be_edited_by?(@commontator_user)) - respond_to do |format| - format.html { redirect_to commontable_url } - format.js + respond_to do |format| + format.html { redirect_to commontable_url } + format.js + end end - end - # PUT /comments/1 - def update - @comment.editor = @commontator_user - @comment.body = params.dig(:comment, :body) - security_transgression_unless @comment.can_be_edited_by?(@commontator_user) + # POST /threads/1/comments + def create + @comment = Commontator::Comment.new( + thread: @commontator_thread, creator: @commontator_user, body: params.dig( + :comment, :body + ) + ) + parent_id = params.dig(:comment, :parent_id) + @comment.parent = Commontator::Comment.find(parent_id) if parent_id.present? + security_transgression_unless(@comment.can_be_created_by?(@commontator_user)) + + respond_to do |format| + if params[:cancel].blank? + if @comment.save + sub = @commontator_thread.config.thread_subscription.to_sym + @commontator_thread.subscribe(@commontator_user) if [:a, :b].include?(sub) + subscribe_mentioned if @commontator_thread.config.mentions_enabled + Commontator::Subscription.comment_created(@comment) + # The next line constitutes a customization of the original controller + update_unread_status + + @commontator_page = @commontator_thread.new_comment_page( + @comment.parent_id, @commontator_show_all + ) + + format.js + else + format.js { render :new } + end + else + format.js { render :cancel } + end - respond_to do |format| - if params[:cancel].blank? - if @comment.save - subscribe_mentioned if @commontator_thread.config.mentions_enabled + format.html { redirect_to commontable_url } + end + end - format.js + # PUT /comments/1 + def update + @comment.editor = @commontator_user + @comment.body = params.dig(:comment, :body) + security_transgression_unless(@comment.can_be_edited_by?(@commontator_user)) + + respond_to do |format| + if params[:cancel].blank? + if @comment.save + subscribe_mentioned if @commontator_thread.config.mentions_enabled + + format.js + else + format.js { render :edit } + end else - format.js { render :edit } + @comment.restore_attributes + + format.js { render :cancel } end - else - @comment.restore_attributes - format.js { render :cancel } + format.html { redirect_to commontable_url } end - - format.html { redirect_to commontable_url } end - end - # PUT /comments/1/delete - def delete - security_transgression_unless @comment.can_be_deleted_by?(@commontator_user) + # PUT /comments/1/delete + def delete + security_transgression_unless(@comment.can_be_deleted_by?(@commontator_user)) - @comment.errors.add(:base, - t('commontator.comment.errors.already_deleted')) \ unless @comment.delete_by(@commontator_user) + @comment.errors.add(:base, + t("commontator.comment.errors.already_deleted")) + end - respond_to do |format| - format.html { redirect_to commontable_url } - format.js { render :delete } + respond_to do |format| + format.html { redirect_to commontable_url } + format.js { render :delete } + end end - end - # PUT /comments/1/undelete - def undelete - security_transgression_unless @comment.can_be_deleted_by?(@commontator_user) + # PUT /comments/1/undelete + def undelete + security_transgression_unless(@comment.can_be_deleted_by?(@commontator_user)) - @comment.errors.add(:base, t('commontator.comment.errors.not_deleted')) \ - unless @comment.undelete_by(@commontator_user) + @comment.errors.add(:base, t("commontator.comment.errors.not_deleted")) \ + unless @comment.undelete_by(@commontator_user) - respond_to do |format| - format.html { redirect_to commontable_url } - format.js { render :delete } + respond_to do |format| + format.html { redirect_to commontable_url } + format.js { render :delete } + end end - end - # PUT /comments/1/upvote - def upvote - security_transgression_unless @comment.can_be_voted_on_by?(@commontator_user) + # PUT /comments/1/upvote + def upvote + security_transgression_unless(@comment.can_be_voted_on_by?(@commontator_user)) - @comment.upvote_from @commontator_user + @comment.upvote_from(@commontator_user) - respond_to do |format| - format.html { redirect_to commontable_url } - format.js { render :vote } + respond_to do |format| + format.html { redirect_to commontable_url } + format.js { render :vote } + end end - end - # PUT /comments/1/downvote - def downvote - security_transgression_unless @comment.can_be_voted_on_by?(@commontator_user) && \ - @comment.thread.config.comment_voting.to_sym == :ld + # PUT /comments/1/downvote + def downvote + security_transgression_unless(@comment.can_be_voted_on_by?(@commontator_user) && \ + @comment.thread.config.comment_voting.to_sym == :ld) - @comment.downvote_from @commontator_user + @comment.downvote_from(@commontator_user) - respond_to do |format| - format.html { redirect_to commontable_url } - format.js { render :vote } + respond_to do |format| + format.html { redirect_to commontable_url } + format.js { render :vote } + end end - end - # PUT /comments/1/unvote - def unvote - security_transgression_unless @comment.can_be_voted_on_by?(@commontator_user) + # PUT /comments/1/unvote + def unvote + security_transgression_unless(@comment.can_be_voted_on_by?(@commontator_user)) - @comment.unvote voter: @commontator_user + @comment.unvote(voter: @commontator_user) - respond_to do |format| - format.html { redirect_to commontable_url } - format.js { render :vote } + respond_to do |format| + format.html { redirect_to commontable_url } + format.js { render :vote } + end end - end - protected + protected - def set_comment_and_thread - @comment = Commontator::Comment.find(params[:id]) - @commontator_thread = @comment.thread - end + def set_comment_and_thread + @comment = Commontator::Comment.find(params[:id]) + @commontator_thread = @comment.thread + end - def subscribe_mentioned - Commontator.commontator_mentions(@commontator_user, @commontator_thread, - '') - .where(id: params[:mentioned_ids]) - .each do |user| - @commontator_thread.subscribe(user) + def subscribe_mentioned + Commontator.commontator_mentions(@commontator_user, @commontator_thread, + "") + .where(id: params[:mentioned_ids]) + .find_each do |user| + @commontator_thread.subscribe(user) + end end - end - # This method ensures that the unread_comments flag is updated - # for users affected by the creation of a newly created comment - # It constitues a customization - def update_unread_status - medium = @commontator_thread.commontable - return unless medium.released.in?(['all', 'users', 'subscribers']) - - relevant_users = medium.teachable.media_scope.users - relevant_users.where.not(id: current_user.id) - .where(unread_comments: false) - .update_all(unread_comments: true) - - # make sure that the thread associated to this comment is marked as read - # by the comment creator (unless some other user posted a comment in it - # that has not yet been read) - @reader = Reader.find_or_create_by(user: current_user, - thread: @commontator_thread) - if unseen_comments? - @update_icon = true - return - end - @reader.update(updated_at: Time.current) - end + # This method ensures that the unread_comments flag is updated + # for users affected by the creation of a newly created comment + # It constitues a customization + def update_unread_status + medium = @commontator_thread.commontable + return unless medium.released.in?(["all", "users", "subscribers"]) + + relevant_users = medium.teachable.media_scope.users + relevant_users.where.not(id: current_user.id) + .where(unread_comments: false) + .update(unread_comments: true) + + # make sure that the thread associated to this comment is marked as read + # by the comment creator (unless some other user posted a comment in it + # that has not yet been read) + @reader = Reader.find_or_create_by(user: current_user, + thread: @commontator_thread) + if unseen_comments? + @update_icon = true + return + end + @reader.touch + end - def unseen_comments? - @commontator_thread.comments.any? do |c| - c.creator != current_user && c.created_at > @reader.updated_at + def unseen_comments? + @commontator_thread.comments.any? do |c| + c.creator != current_user && c.created_at > @reader.updated_at + end end - end + end end diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb index b0fd5e1ed..66daae203 100644 --- a/app/controllers/confirmations_controller.rb +++ b/app/controllers/confirmations_controller.rb @@ -1,7 +1,7 @@ class ConfirmationsController < Devise::ConfirmationsController private - def after_confirmation_path_for(resource_name, resource) + def after_confirmation_path_for(_resource_name, resource) sign_in(resource) # In case you want to sign in the user edit_profile_path end diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 67be24754..bfe9704a9 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -5,7 +5,7 @@ class CoursesController < ApplicationController before_action :check_if_enough_questions, only: [:take_random_quiz] before_action :check_for_consent authorize_resource except: [:create, :search] - layout 'administration' + layout "administration" def current_ability @current_ability ||= CourseAbility.new(current_user) @@ -15,22 +15,6 @@ def edit I18n.locale = @course.locale || I18n.default_locale end - def update - I18n.locale = @course.locale || I18n.default_locale - old_image_data = @course.image_data - @course.update(course_params) - @errors = @course.errors - return unless @errors.empty? - - @course.update(image: nil) if params[:course][:detach_image] == 'true' - changed_image = @course.image_data != old_image_data - if @course.image.present? && changed_image - @course.image_derivatives! - @course.save - end - @errors = @course.errors - end - def create @course = Course.new(course_params) authorize! :create, @course @@ -39,15 +23,31 @@ def create # set organizational_concept to default set_organizational_defaults redirect_to administration_path, - notice: I18n.t('controllers.created_course_success', + notice: I18n.t("controllers.created_course_success", course: @course.title, editors: @course.editors.map(&:name) - .join(', ')) + .join(", ")) return end @errors = @course.errors end + def update + I18n.locale = @course.locale || I18n.default_locale + old_image_data = @course.image_data + @course.update(course_params) + @errors = @course.errors + return unless @errors.empty? + + @course.update(image: nil) if params[:course][:detach_image] == "true" + changed_image = @course.image_data != old_image_data + if @course.image.present? && changed_image + @course.image_derivatives! + @course.save + end + @errors = @course.errors + end + def destroy @course.destroy # destroy all notifications related to this course @@ -80,14 +80,14 @@ def search private def set_course - @course = Course.find_by_id(params[:id]) + @course = Course.find_by(id: params[:id]) return if @course.present? - redirect_to :root, alert: I18n.t('controllers.no_course') + redirect_to :root, alert: I18n.t("controllers.no_course") end def set_course_admin - @course = Course.find_by_id(params[:id]) + @course = Course.find_by(id: params[:id]) return if @course.present? redirect_to administration_path @@ -121,15 +121,15 @@ def random_quiz_params # destroy all notifications related to this course def destroy_notifications - Notification.where(notifiable_id: @course.id, notifiable_type: 'Course') + Notification.where(notifiable_id: @course.id, notifiable_type: "Course") .delete_all end # fill organizational_concept with default view def set_organizational_defaults @course.update(organizational_concept: - render_to_string(partial: 'courses/' \ - 'organizational_default', + render_to_string(partial: "courses/" \ + "organizational_default", formats: :html, layout: false)) end @@ -137,7 +137,7 @@ def set_organizational_defaults def check_if_enough_questions return if @course.enough_questions? - redirect_to :root, alert: I18n.t('controllers.no_test') + redirect_to :root, alert: I18n.t("controllers.no_test") end def check_for_consent diff --git a/app/controllers/divisions_controller.rb b/app/controllers/divisions_controller.rb index 9c8ecdd53..dc2195d75 100644 --- a/app/controllers/divisions_controller.rb +++ b/app/controllers/divisions_controller.rb @@ -7,17 +7,12 @@ def current_ability @current_ability ||= DivisionAbility.new(current_user) end - def edit - end - def new @division = Division.new(program_id: params[:program_id].to_i) authorize! :new, @division end - def update - @division.update(division_params) - redirect_to classification_path + def edit end def create @@ -28,6 +23,11 @@ def create redirect_to classification_path end + def update + @division.update(division_params) + redirect_to classification_path + end + def destroy @division.destroy redirect_to classification_path @@ -36,10 +36,10 @@ def destroy private def set_division - @division = Division.find_by_id(params[:id]) + @division = Division.find_by(id: params[:id]) return if @division.present? - redirect_to root_path, alert: I18n.t('controllers.no_division') + redirect_to root_path, alert: I18n.t("controllers.no_division") end def division_params diff --git a/app/controllers/erdbeere_controller.rb b/app/controllers/erdbeere_controller.rb index d880b9114..23c78601e 100644 --- a/app/controllers/erdbeere_controller.rb +++ b/app/controllers/erdbeere_controller.rb @@ -1,38 +1,38 @@ # ExamplesController class ErdbeereController < ApplicationController authorize_resource class: false - layout 'application' + layout "application" def current_ability @current_ability ||= ErdbeereAbility.new(current_user) end def show_example - response = Faraday.get(ENV['ERDBEERE_API'] + "/examples/#{params[:id]}") + response = Faraday.get(ENV.fetch("ERDBEERE_API", nil) + "/examples/#{params[:id]}") @content = if response.status == 200 - JSON.parse(response.body)['embedded_html'] + JSON.parse(response.body)["embedded_html"] else - 'Something went wrong.' + "Something went wrong." end end def show_property - response = Faraday.get(ENV['ERDBEERE_API'] + "/properties/#{params[:id]}") + response = Faraday.get(ENV.fetch("ERDBEERE_API", nil) + "/properties/#{params[:id]}") @content = if response.status == 200 - JSON.parse(response.body)['embedded_html'] + JSON.parse(response.body)["embedded_html"] else - 'Something went wrong.' + "Something went wrong." end end def show_structure - id = params[:id] - response = Faraday.get(ENV['ERDBEERE_API'] + "/structures/#{params[:id]}") + params[:id] + response = Faraday.get(ENV.fetch("ERDBEERE_API", nil) + "/structures/#{params[:id]}") @content = if response.status == 200 - JSON.parse(response.body)['embedded_html'] + JSON.parse(response.body)["embedded_html"] else - 'Something went wrong.' + "Something went wrong." end end @@ -51,18 +51,18 @@ def cancel_edit_tags def display_info @id = params[:id] @sort = params[:sort] - response = Faraday.get(ENV['ERDBEERE_API'] + + response = Faraday.get(ENV.fetch("ERDBEERE_API", nil) + "/#{@sort.downcase.pluralize}/#{@id}/view_info") @content = JSON.parse(response.body) if response.status != 200 - @info = 'Something went wrong' + @info = "Something went wrong" return end - @info = if @sort == 'Structure' - @content['data']['attributes']['name'] + @info = if @sort == "Structure" + @content["data"]["attributes"]["name"] else - "#{@content['included'][0]['attributes']['name']}:"\ - "#{@content['data']['attributes']['name']}" + "#{@content["included"][0]["attributes"]["name"]}:" \ + "#{@content["data"]["attributes"]["name"]}" end end @@ -79,7 +79,7 @@ def update_tags removed_tags.each do |t| t.update(realizations: t.realizations - [[sort, id]]) end - if sort == 'Structure' + if sort == "Structure" redirect_to erdbeere_structure_path(id) return end @@ -87,28 +87,26 @@ def update_tags end def fill_realizations_select - response = Faraday.get(ENV['ERDBEERE_API'] + '/structures/') - @tag = Tag.find_by_id(params[:id]) + response = Faraday.get("#{ENV.fetch("ERDBEERE_API", nil)}/structures/") + @tag = Tag.find_by(id: params[:id]) hash = JSON.parse(response.body) - @structures = hash['data'].map do |d| - { id: d['id'], - name: d['attributes']['name'], - properties: d['relationships']['original_properties']['data'].map { |x| - x['id'] - } } + @structures = hash["data"].map do |d| + { id: d["id"], + name: d["attributes"]["name"], + properties: d["relationships"]["original_properties"]["data"].pluck("id") } end - @properties = hash['included'].map do |d| - { id: d['id'], - name: d['attributes']['name'] } + @properties = hash["included"].map do |d| + { id: d["id"], + name: d["attributes"]["name"] } end end def find_example - response = Faraday.get(ENV['ERDBEERE_API'] + '/find?' + find_params.to_query) + response = Faraday.get("#{ENV.fetch("ERDBEERE_API", nil)}/find?#{find_params.to_query}") @content = if response.status == 200 - JSON.parse(response.body)['embedded_html'] + JSON.parse(response.body)["embedded_html"] else - 'Something went wrong.' + "Something went wrong." end end diff --git a/app/controllers/interactions_controller.rb b/app/controllers/interactions_controller.rb index 81242996b..20cb9c5fd 100644 --- a/app/controllers/interactions_controller.rb +++ b/app/controllers/interactions_controller.rb @@ -1,7 +1,7 @@ # InteractionsController class InteractionsController < ApplicationController authorize_resource - layout 'administration' + layout "administration" def index end @@ -12,10 +12,10 @@ def export_interactions @interactions = Interaction.created_between(start_date, end_date) respond_to do |format| format.html { head :ok } - format.csv { - send_data @interactions.to_csv, - filename: "interactions-from-#{start_date}-to-#{end_date}-at-#{Time.now}.csv" - } + format.csv do + csv_filename = "interactions-from-#{start_date}-to-#{end_date}-at-#{Time.zone.now}.csv" + send_data(@interactions.to_csv, filename: csv_filename) + end end end @@ -25,10 +25,10 @@ def export_probes @probes = Probe.created_between(start_date, end_date) respond_to do |format| format.html { head :ok } - format.csv { - send_data @probes.to_csv, - filename: "probes-from-#{start_date}-to-#{end_date}-at-#{Time.now}.csv" - } + format.csv do + send_data(@probes.to_csv, + filename: "probes-from-#{start_date}-to-#{end_date}-at-#{Time.zone.now}.csv") + end end end diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb index 56c0bf885..648068202 100644 --- a/app/controllers/items_controller.rb +++ b/app/controllers/items_controller.rb @@ -7,12 +7,6 @@ def current_ability @current_ability ||= ItemAbility.new(current_user) end - def update - I18n.locale = @item.medium.locale_with_inheritance if @item.medium - @item.update(item_params) - @errors = @item.errors unless @item.valid? - end - def edit I18n.locale = @item.medium.locale_with_inheritance if @item.medium end @@ -34,10 +28,16 @@ def create render :update end + def update + I18n.locale = @item.medium.locale_with_inheritance if @item.medium + @item.update(item_params) + @errors = @item.errors unless @item.valid? + end + def destroy @medium = @item.medium @item.destroy - redirect_to edit_medium_path(@medium) if params[:from] == 'quarantine' + redirect_to edit_medium_path(@medium) if params[:from] == "quarantine" end # if an item is selected from within the reference editor in thyme, @@ -55,9 +55,7 @@ def set_item end def set_explanation - if @referral_id.zero? || @item != Referral.find(@referral_id).item - return @item.explanation - end + return @item.explanation if @referral_id.zero? || @item != Referral.find(@referral_id).item Referral.find(@referral_id).explanation end @@ -71,7 +69,7 @@ def item_params if filter[:medium_id].present? filter[:start_time] = TimeStamp.new(time_string: filter[:start_time]) end - filter[:section_id] = nil if filter[:section_id] == '' + filter[:section_id] = nil if filter[:section_id] == "" filter end end diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb index b2cf71332..d108fbbc0 100644 --- a/app/controllers/lectures_controller.rb +++ b/app/controllers/lectures_controller.rb @@ -11,58 +11,18 @@ class LecturesController < ApplicationController before_action :set_view_locale, only: [:edit, :show, :subscribe_page, :show_random_quizzes] before_action :check_if_enough_questions, only: [:show_random_quizzes] - layout 'administration' + layout "administration" def current_ability @current_ability ||= LectureAbility.new(current_user) end - def edit - if stale?(etag: @lecture, - last_modified: [current_user.updated_at, @lecture.updated_at, - Time.parse(ENV['RAILS_CACHE_ID'])].max) - eager_load_stuff - end - end - - def update - editor_ids = lecture_params[:editor_ids] - if editor_ids != nil - # removes the empty String "" in the NEW array of editor ids - # and converts it into an array of integers - all_ids = editor_ids.map(&:to_i) - [0] - old_ids = @lecture.editor_ids - new_ids = all_ids - old_ids - - # returns an array of Users that match the given ids - recipients = User.where(id: new_ids) - - recipients.each do |r| - NotificationMailer.with(recipient: r, - locale: r.locale, - lecture: @lecture) - .new_editor_email.deliver_later - end - end - - @lecture.update(lecture_params) - if structure_params.present? - structure_ids = structure_params.select { |_k, v| v.to_i == 1 }.keys - .map(&:to_i) - @lecture.update(structure_ids: structure_ids) - end - @lecture.touch - @lecture.forum&.update(name: @lecture.forum_title) - redirect_to edit_lecture_path(@lecture) if @lecture.valid? - @errors = @lecture.errors - end - def show # deactivate http caching for the moment if stale?(etag: @lecture, last_modified: [current_user.updated_at, @lecture.updated_at, - Time.parse(ENV['RAILS_CACHE_ID']), + Time.zone.parse(ENV.fetch("RAILS_CACHE_ID", nil)), Thredded::UserDetail.find_by(user_id: current_user.id) &.last_seen_at || @lecture.updated_at, @lecture.forum&.updated_at || @lecture.updated_at].max) @@ -72,14 +32,14 @@ def show media: [:teachable, :tags], lessons: [media: [:tags]], chapters: [:lecture, - sections: [lessons: [:tags], - chapter: [:lecture], - tags: [:notions, - :lessons]]]) - .find_by_id(params[:id]) + { sections: [lessons: [:tags], + chapter: [:lecture], + tags: [:notions, + :lessons]] }]) + .find_by(id: params[:id]) @notifications = current_user.active_notifications(@lecture) @new_topics_count = @lecture.unread_forum_topics_count(current_user) || 0 - render layout: 'application' + render layout: "application" end end @@ -87,45 +47,85 @@ def new @lecture = Lecture.new authorize! :new, @lecture @from = params[:from] - return unless @from == 'course' + return unless @from == "course" # if new action was triggered from inside a course view, add the course # info to the lecture - @lecture.course = Course.find_by_id(params[:course]) + @lecture.course = Course.find_by(id: params[:course]) I18n.locale = @lecture.course.locale end + def edit + if stale?(etag: @lecture, + last_modified: [current_user.updated_at, @lecture.updated_at, + Time.zone.parse(ENV.fetch("RAILS_CACHE_ID", nil))].max) + eager_load_stuff + end + end + def create @lecture = Lecture.new(lecture_params) authorize! :create, @lecture @lecture.save if @lecture.valid? - @lecture.update(sort: 'special') if @lecture.course.term_independent + @lecture.update(sort: "special") if @lecture.course.term_independent # set organizational_concept to default set_organizational_defaults # set lenguage to default language set_language # depending on where the create action was trriggered from, return # to admin index view or edit course view - unless params[:lecture][:from] == 'course' + unless params[:lecture][:from] == "course" redirect_to administration_path, - notice: I18n.t('controllers.created_lecture_success', + notice: I18n.t("controllers.created_lecture_success", lecture: @lecture.title_with_teacher) return end redirect_to edit_course_path(@lecture.course), - notice: I18n.t('controllers.created_lecture_success', + notice: I18n.t("controllers.created_lecture_success", lecture: @lecture.title_with_teacher) return end @errors = @lecture.errors end + def update + editor_ids = lecture_params[:editor_ids] + unless editor_ids.nil? + # removes the empty String "" in the NEW array of editor ids + # and converts it into an array of integers + all_ids = editor_ids.map(&:to_i) - [0] + old_ids = @lecture.editor_ids + new_ids = all_ids - old_ids + + # returns an array of Users that match the given ids + recipients = User.where(id: new_ids) + + recipients.each do |r| + NotificationMailer.with(recipient: r, + locale: r.locale, + lecture: @lecture) + .new_editor_email.deliver_later + end + end + + @lecture.update(lecture_params) + if structure_params.present? + structure_ids = structure_params.select { |_k, v| v.to_i == 1 }.keys + .map(&:to_i) + @lecture.update(structure_ids: structure_ids) + end + @lecture.touch + @lecture.forum&.update(name: @lecture.forum_title) + redirect_to edit_lecture_path(@lecture) if @lecture.valid? + @errors = @lecture.errors + end + def publish - @lecture.update(released: 'all') - if params[:medium][:publish_media] == '1' + @lecture.update(released: "all") + if params[:medium][:publish_media] == "1" @lecture.media_with_inheritance - .update_all(released: params[:medium][:released]) + .update(released: params[:medium][:released]) end # create notifications about creation od this lecture and send email create_notifications @@ -177,12 +177,12 @@ def show_announcements @active_notification_count = current_user.active_notifications(@lecture) .size I18n.locale = @lecture.locale_with_inheritance - render layout: 'application' + render layout: "application" end def organizational I18n.locale = @lecture.locale_with_inheritance - render layout: 'application' + render layout: "application" end def import_media @@ -195,9 +195,9 @@ def import_media end def remove_imported_medium - @medium = Medium.find_by_id(params[:medium]) + @medium = Medium.find_by(id: params[:medium]) import = Import.find_by(teachable: @lecture, medium: @medium) - import.destroy if import + import&.destroy @lecture.reload @lecture.touch end @@ -208,24 +208,26 @@ def show_subscribers end def show_structures - render layout: 'application' + render layout: "application" end def edit_structures - render layout: 'application' + render layout: "application" end def search_examples if @lecture.structure_ids.any? - response = Faraday.get(ENV['ERDBEERE_API'] + '/search') - @form = JSON.parse(response.body)['embedded_html'] - @form.gsub!('token_placeholder', - '') + # rubocop:enable Style/StringConcatenation else - @form = I18n.t('erdbeere.no_structures') + @form = I18n.t("erdbeere.no_structures") end - render layout: 'application' + render layout: "application" end def close_comments @@ -246,7 +248,7 @@ def search @total = search.total @lectures = Kaminari.paginate_array(results, total_count: @total) .page(params[:page]).per(search_params[:per]) - @results_as_list = search_params[:results_as_list] == 'true' + @results_as_list = search_params[:results_as_list] == "true" return unless @total.zero? return unless search_params[:fulltext]&.length.to_i > 1 @@ -255,24 +257,24 @@ def search def show_random_quizzes @course = @lecture.course - render layout: 'application' + render layout: "application" end def display_course @course = @lecture.course I18n.locale = @course.locale || @lecture.locale - render layout: 'application' + render layout: "application" end def subscribe_page - render layout: 'application_no_sidebar' + render layout: "application_no_sidebar" end def import_toc imported_lecture = Lecture - .find_by_id(import_toc_params[:imported_lecture_id]) - import_sections = import_toc_params[:import_sections] == '1' - import_tags = import_toc_params[:import_tags] == '1' + .find_by(id: import_toc_params[:imported_lecture_id]) + import_sections = import_toc_params[:import_sections] == "1" + import_tags = import_toc_params[:import_tags] == "1" @lecture.import_toc!(imported_lecture, import_sections, import_tags) redirect_to edit_lecture_path(@lecture) end @@ -280,10 +282,10 @@ def import_toc private def set_lecture - @lecture = Lecture.find_by_id(params[:id]) + @lecture = Lecture.find_by(id: params[:id]) return if @lecture - redirect_to :root, alert: I18n.t('controllers.no_lecture') + redirect_to :root, alert: I18n.t("controllers.no_lecture") end def set_lecture_cookie @@ -300,7 +302,9 @@ def check_for_consent end def check_for_subscribe - redirect_to subscribe_lecture_page_path(@lecture.id) unless @lecture.in?(current_user.lectures) + return if @lecture.in?(current_user.lectures) + + redirect_to subscribe_lecture_page_path(@lecture.id) end def lecture_params @@ -310,12 +314,10 @@ def lecture_params :organizational_on_top, :disable_teacher_display, :content_mode, :passphrase, :sort, :comments_disabled, :submission_max_team_size, :submission_grace_period] - if action_name == 'update' && current_user.can_update_personell?(@lecture) - allowed_params.concat([:teacher_id, editor_ids: []]) - end - if action_name == 'create' - allowed_params.concat([:course_id, :teacher_id, editor_ids: []]) + if action_name == "update" && current_user.can_update_personell?(@lecture) + allowed_params.push(:teacher_id, { editor_ids: [] }) end + allowed_params.push(:course_id, :teacher_id, { editor_ids: [] }) if action_name == "create" params.require(:lecture).permit(allowed_params) end @@ -337,8 +339,8 @@ def create_notifications User.find_each do |u| notifications << Notification.new(recipient: u, notifiable_id: @lecture.id, - notifiable_type: 'Lecture', - action: 'create') + notifiable_type: "Lecture", + action: "create") end Notification.import notifications end @@ -347,25 +349,25 @@ def send_notification_email recipients = User.where(email_for_teachable: true) I18n.available_locales.each do |l| local_recipients = recipients.where(locale: l) - if local_recipients.any? - NotificationMailer.with(recipients: local_recipients.pluck(:id), - locale: l, - lecture: @lecture) - .new_lecture_email.deliver_later - end + next unless local_recipients.any? + + NotificationMailer.with(recipients: local_recipients.pluck(:id), + locale: l, + lecture: @lecture) + .new_lecture_email.deliver_later end end # destroy all notifications related to this lecture def destroy_notifications - Notification.where(notifiable_id: @lecture.id, notifiable_type: 'Lecture') + Notification.where(notifiable_id: @lecture.id, notifiable_type: "Lecture") .delete_all end # fill organizational_concept with default view def set_organizational_defaults - partial_path = 'lectures/organizational/' - partial_path += @lecture.seminar? ? 'seminar' : 'lecture' + partial_path = "lectures/organizational/" + partial_path += @lecture.seminar? ? "seminar" : "lecture" @lecture.update(organizational_concept: render_to_string(partial: partial_path, formats: :html, @@ -384,11 +386,11 @@ def eager_load_stuff media: [:teachable, :tags], lessons: [media: [:tags]], chapters: [:lecture, - sections: [lessons: [:tags], - chapter: [:lecture], - tags: [:notions, - :lessons]]]) - .find_by_id(params[:id]) + { sections: [lessons: [:tags], + chapter: [:lecture], + tags: [:notions, + :lessons]] }]) + .find_by(id: params[:id]) @media = @lecture.media_with_inheritance_uncached_eagerload_stuff lecture_tags = @lecture.tags @course_tags = @lecture.course_tags(lecture_tags: lecture_tags) @@ -400,23 +402,23 @@ def eager_load_stuff def set_erdbeere_data @structure_ids = @lecture.structure_ids - response = Faraday.get(ENV['ERDBEERE_API'] + '/structures') + response = Faraday.get("#{ENV.fetch("ERDBEERE_API", nil)}/structures") response_hash = if response.status == 200 JSON.parse(response.body) else - { 'data' => {}, 'included' => {} } + { "data" => {}, "included" => {} } end - @all_structures = response_hash['data'] + @all_structures = response_hash["data"] @structures = @all_structures.select do |s| - s['id'].to_i.in?(@structure_ids) + s["id"].to_i.in?(@structure_ids) end - @properties = response_hash['included'] + @properties = response_hash["included"] end def search_params types = params[:search][:types] - types = [types] if types && !types.kind_of?(Array) - types -= [''] if types + types = [types] if types && !types.is_a?(Array) + types -= [""] if types types = nil if types == [] params[:search][:types] = types params[:search][:user_id] = current_user.id @@ -432,6 +434,6 @@ def search_params def check_if_enough_questions return if @lecture.course.enough_questions? - redirect_to :root, alert: I18n.t('controllers.no_test') + redirect_to :root, alert: I18n.t("controllers.no_test") end end diff --git a/app/controllers/lessons_controller.rb b/app/controllers/lessons_controller.rb index 2425dce7d..bd8ca7e4f 100644 --- a/app/controllers/lessons_controller.rb +++ b/app/controllers/lessons_controller.rb @@ -2,7 +2,7 @@ class LessonsController < ApplicationController before_action :set_lesson, except: [:new, :create] authorize_resource except: [:new, :create] - layout 'administration' + layout "administration" def current_ability @current_ability ||= LessonAbility.new(current_user) @@ -10,22 +10,22 @@ def current_ability def show I18n.locale = @lesson.locale_with_inheritance - render layout: 'application_no_sidebar' - end - - def edit - I18n.locale = @lesson.locale_with_inheritance + render layout: "application_no_sidebar" end def new - @lecture = Lecture.find_by_id(params[:lecture_id]) + @lecture = Lecture.find_by(id: params[:lecture_id]) I18n.locale = @lecture.locale_with_inheritance if @lecture @lesson = Lesson.new(lecture: @lecture) - section = Section.find_by_id(params[:section_id]) + section = Section.find_by(id: params[:section_id]) @lesson.sections << section if section authorize! :new, @lesson end + def edit + I18n.locale = @lesson.locale_with_inheritance + end + def create @lesson = Lesson.new(lesson_params) authorize! :create, @lesson @@ -34,7 +34,7 @@ def create @lesson.tags = @lesson.sections.map(&:tags).flatten @lesson.save @errors = @lesson.errors - if @lesson.valid? && params[:commit] == t('buttons.save_and_edit') + if @lesson.valid? && params[:commit] == t("buttons.save_and_edit") redirect_to edit_lesson_path(@lesson) return end @@ -45,7 +45,7 @@ def update I18n.locale = @lesson.lecture.locale_with_inheritance @lesson.update(lesson_params) @errors = @lesson.errors - return unless @errors.blank? + return if @errors.present? update_media_order if params[:lesson][:media_order] @tags_without_section = @lesson.tags_without_section @@ -63,7 +63,7 @@ def destroy media.each do |m| m.update(teachable: lecture, description: m.description.presence || - (m.title + ' (' + I18n.t('admin.lesson.destroyed') + ')')) + "#{m.title} (#{I18n.t("admin.lesson.destroyed")})") end @lesson.destroy redirect_to edit_lecture_path(lecture) @@ -72,10 +72,10 @@ def destroy private def set_lesson - @lesson = Lesson.find_by_id(params[:id]) + @lesson = Lesson.find_by(id: params[:id]) return if @lesson.present? - redirect_to :root, alert: I18n.t('controllers.no_lesson') + redirect_to :root, alert: I18n.t("controllers.no_lesson") end def lesson_params diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 490b5103c..8fa45237c 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -2,7 +2,7 @@ class MainController < ApplicationController before_action :check_for_consent authorize_resource class: false, only: :start - layout 'application_no_sidebar' + layout "application_no_sidebar" def current_ability @current_ability ||= MainAbility.new(current_user) @@ -10,11 +10,11 @@ def current_ability def home cookies[:locale] = current_user.locale if user_signed_in? - get_announcements + announcements end def error - redirect_to :root, alert: I18n.t('controllers.no_page') + redirect_to :root, alert: I18n.t("controllers.no_page") end def news @@ -29,7 +29,7 @@ def comments @media_comments = current_user.media_latest_comments @media_comments.select! do |m| (Reader.find_by(user: current_user, thread: m[:thread]) - &.updated_at || (Time.now - 1000.years)) < m[:latest_comment].created_at && + &.updated_at || 1000.years.ago) < m[:latest_comment].created_at && m[:medium].visible_for_user?(current_user) end @media_array = Kaminari.paginate_array(@media_comments) @@ -43,7 +43,7 @@ def start :term) .sort end - get_announcements + announcements @talks = current_user.talks.includes(lecture: :term) .select { |t| t.visible_for_user?(current_user) } .sort_by do |t| @@ -60,7 +60,7 @@ def check_for_consent redirect_to consent_profile_path unless current_user.consents end - def get_announcements + def announcements @announcements = Announcement.where(on_main_page: true, lecture: nil) .pluck(:details) .join('