app/controllers/api/events_controller.rb

@@ -4,7 +4,7 @@ class Api::EventsController < Api::ApplicationController
   before_action :require_current_conference!
 
   def index
-    @events = current_conference.events.approved.joins(:proposition).includes(:participations).with_attached_resources_bundle
+    @events = current_conference.events.approved.joins(:proposition).includes(:participations)
   end
 
   def halfnarp_friendly

app/controllers/management/events_controller.rb

@@ -9,7 +9,6 @@ module Management
                          .eager_load(:participants_with_personal_profiles,
                                      :proposition, :proposer, {track: [:translations]},
                                      {event_type: [:translations]}, :feedbacks)
-                         .with_attached_resources_bundle
                          .preload(:conference), filters: params[:filters]).results
 
       # @events = @conference.events.order(:title).includes(:proposition, :proposer, :track, :event_type)
@@ -77,7 +76,6 @@ module Management
         :abstract,
         :description,
         :notes,
-        :resources_bundle,
         :track_id,
         :event_type_id,
         participations_attributes: [

app/controllers/public/events_controller.rb

@@ -2,16 +2,12 @@ module Public
   class EventsController < Public::ApplicationController
     before_action :authenticate_user!
 
-    def current_user_events
-      Event.joins(:conference, :proposition, :participations).where(conference: current_conference).where("propositions.proposer_id = ? OR participations.participant_id = ?", current_user.id, current_user.id)
-    end
-
     def index
-      @events = current_user_events
+      @events = Event.joins(:conference, :proposition, :participations).where(conference: current_conference).where("propositions.proposer_id = ? OR participations.participant_id = ?", current_user.id, current_user.id)
     end
 
     def edit
-      @event = current_user_events.find_by(id: params[:id])
+      @event = Event.joins(:participations).find_by(id: params[:id], participations: {participant_id: current_user.id})
     end
 
     def new
@@ -34,9 +30,9 @@ module Public
     end
 
     def update
-      @event = current_user_events.find_by(id: params[:id])
+      @event = Event.joins(:participations).find_by(id: params[:id], participations: {participant_id: current_user.id})
 
-      if @event.fields_editable_by_participant && @event.update(event_params.permit(@event.fields_editable_by_participant))
+      if @event.update(event_params)
         flash[:notice] = I18n.t("views.events.event_successfully_updated", event_type: @event.event_type.name.mb_chars.downcase)
         after_save_redirect
       else
@@ -60,7 +56,9 @@ module Public
 
     def event_params
       params.require(:event).permit(
-        Event.new.fields_editable_by_participant
+        :title, :subtitle, :track_id, :length, :language,
+        :abstract, :description, :notes, :agreement,
+        :event_type_id
       )
     end
 

app/models/event.rb

@@ -12,8 +12,6 @@ class Event < ActiveRecord::Base
   has_many :participants_with_personal_profiles, through: :approved_participations, source: :participant_with_personal_profile
   has_many :conflict_counts, -> { order(number_of_conflicts: :desc) }, foreign_key: :left_id
 
-  has_one_attached :resources_bundle
-
   has_many :feedbacks, as: :feedback_receiving
   has_many :feedbacks_with_comment, -> { where.not(comment: [nil, ""]) }, as: :feedback_receiving, class_name: 'Feedback'
   include FeedbackReceiving
@@ -70,25 +68,6 @@ class Event < ActiveRecord::Base
     }
   end
 
-  def fields_editable_by_participant
-    if not id or conference.start_date > 7.days.from_now
-      [
-        :title, :subtitle, :track_id, :length, :language,
-        :abstract, :description, :notes,
-        :resources_bundle,
-        :agreement,
-        :event_type_id
-      ]
-    elsif conference.end_date > -14.days.from_now
-      [
-        :resources_bundle,
-        :agreement,
-      ]
-    else
-      []
-    end
-  end
-
   def ranked?
     conference.has_vote_results? && rank.present? && number_of_votes.present?
   end

app/views/api/events/index.jbuilder

@@ -11,6 +11,5 @@
     json.participant_user_ids event.participations.map(&:participant_id)
     json.feedback_url new_event_feedback_url(event_id: event.id)
     json.feedback_qr_code_url event_feedback_qr_code_url(event_id: event.id, format: :svg)
-    json.resources_bundle ((event.resources_bundle.attached? && event.conference.end_date < 0.days.from_now) ? rails_blob_url(event.resources_bundle, disposition: "attachment") : nil)
   end
 end

app/views/event_mailer/confirmation_request.bg.text.erb

@@ -11,5 +11,7 @@
 
 С приложения QR код към този имейл ще можете да достъпите формуляра за обратна връзка на предложеното от Вас събитие. Моля, включете го в презентацията си.
 
+Ако планирате да представяте отдалечено или използвате MacBook, моля, отговорете на този имейл, за да ни уведомите. Също така, ако имате въпроси или нужда от допълнителна информация, не се колебайте да се свържете с нас, като отговорите на този имейл.
+
 Поздрави,
 Екипът на <%= @event.conference.title %>

app/views/event_mailer/confirmation_request.en.text.erb

@@ -11,6 +11,8 @@ To confirm your participation please follow the link below as soon as you can:
 
 We kindly request that you ensure the inclusion of the QR code attached to this email in your presentation. It links directly to the feedback form for your presentation, making it easier for attendees to provide valuable insights.
 
+Additionally, please respond to this email to let us know whether your presentation will be remote or if you plan to present using a MacBook.
+
 Should you have any questions or require further information, please do not hesitate to contact us by replying to this email.
 
 Best regards,

app/views/management/events/edit.html.slim

@@ -18,13 +18,6 @@
       = f.input :abstract
       = f.input :description
       = f.input :notes
-      div class="form-group file optional resources_bundle"
-        dev class="col-sm-3 control-label text optional"
-          = f.label :resources_bundle
-        .col-sm-9
-          = link_to @event.resources_bundle.filename, rails_blob_url(@event.resources_bundle.blob, disposition: "attachment") if @event.resources_bundle.attached?
-          = f.hidden_field :resources_bundle, value:@event.resources_bundle.signed_id if @event.resources_bundle.attached?
-          = f.input :resources_bundle, as: :file, wrapper: false, input_html: {direct_upload: true}, label: false
       hr
       .row
         .col-lg-12

app/views/management/events/index.csv.erb

@@ -1,5 +1,5 @@
-<%- csv_headers = %w{id title subtitle type track language participants length status rank number_of_votes abstract description proposer_notes resources_bundle} -%>
+<%- csv_headers = %w{id title subtitle type track language paticipants length status rank number_of_votes proposer_notes} -%>
 <%= CSV.generate_line(csv_headers).html_safe -%>
 <%- @events.each do |event| -%>
-  <%= CSV.generate_line([event.id, event.title, event.subtitle, event.event_type.name, event.track.name, event.language, participant_names_with_emails(event).join(', '), event.length, event.status, event.rank, event.number_of_votes, event.abstract, event.description, event.notes, (rails_blob_url(event.resources_bundle, disposition: "attachment") if event.resources_bundle.attached?)]).html_safe -%>
+  <%= CSV.generate_line([event.id, event.title, event.subtitle, event.event_type.name, event.track.name, event.language, participant_names_with_emails(event).join(', '), event.length, event.status, event.rank, event.number_of_votes, event.notes]).html_safe -%>
 <%- end -%>

app/views/management/events/show.html.slim

@@ -36,9 +36,6 @@
     - if @event.notes.present?
       h3 = Event.human_attribute_name :notes
       p = simple_format @event.notes
-    - if @event.resources_bundle.attached?
-      h3 = Event.human_attribute_name :resources_bundle
-      p = link_to @event.resources_bundle.filename, rails_blob_url(@event.resources_bundle.blob, disposition: "attachment")
   - if @conference.has_vote_results? or @conference.has_voting_endpoint?
     .col-md-3
       .panel.panel-info.panel-rank

config/locales/bg.yml

@@ -84,7 +84,6 @@ bg:
         language: "Език"
         length: "Продължителност"
         notes: "Допълнителни бележки"
-        resources_bundle: "Ресурси (презентация, код, ...)"
         subtitle: "Подзаглавие"
         title: "Заглавие"
         track: "Поток от лекции"
@@ -358,7 +357,6 @@ bg:
         language: ""
         length: "Продължителността на събитието (в минути). Продължителността на %{type} е между %{min} и %{max} минути, заедно с въпросите"
         notes: "Допълнителни бележки, които искате да споделите с организаторския екип"
-        resources_bundle: "Ресурси за посетителите - слайдове, код, записки, файл с връзки, архив... Те ще бъдат предоставени налични за сваляне от посетителите след конференцията."
         subtitle: ""
         title: ""
         track: "Потокът от лекции, в който искате да попадне предложението ви"

config/locales/en.yml

@@ -84,7 +84,6 @@ en:
         language: "Language"
         length: "Length"
         notes: "Notes"
-        resources_bundle: "Resources bundle"
         subtitle: "Sub-title"
         title: "Title"
         track: "Track"
@@ -358,7 +357,6 @@ en:
         language: ""
         length: "Length of the event (in minutes). The length of a %{type} is between %{min} and %{max} minutes"
         notes: "Notes that you'd like the organisation team to read"
-        resources_bundle: "Resources for the visitors - slides, code, notes, file with links, archive... These will be available to the visitors after the conference."
         subtitle: ""
         title: ""
         track: "The lecture track for your event"

lib/initfest/views/public/events/_form.slim

@@ -1,22 +1,18 @@
 = simple_form_for @event, wrapper: :default do |form|
-  = form.input :event_type_id, as: :hidden, wrapper: false, disabled: :event_type.in?(@event.fields_editable_by_participant)
+  = form.input :event_type_id, as: :hidden, wrapper: false
 
   p
     = form.error_notification
 
   .form-inputs
-    = form.input :title, autofocus: true, disabled: !:title.in?(@event.fields_editable_by_participant)
-    = form.input :subtitle, disabled: !:subtitle.in?(@event.fields_editable_by_participant)
-    = form.association :track, wrapper: :default, collection: current_conference.tracks.map { |track| [track.name, track.id, {title: track.description}] }, disabled: !:track_id.in?(@event.fields_editable_by_participant)
-    = form.input :length, hint: t('simple_form.hints.event.length', type: @event.event_type.name.mb_chars.downcase, min: @event.event_type.minimum_length, max: @event.event_type.maximum_length), disabled: !:length.in?(@event.fields_editable_by_participant)
-    = form.input :language, as: :radio_buttons, collection: locale_collection, include_blank: false, wrapper: :default, disabled: !:language.in?(@event.fields_editable_by_participant)
-    = form.input :abstract, disabled: !:abstract.in?(@event.fields_editable_by_participant)
-    = form.input :description, disabled: !:description.in?(@event.fields_editable_by_participant)
-    = form.input :notes, disabled: !:notes.in?(@event.fields_editable_by_participant)
-    .input
-      = link_to @event.resources_bundle.filename, rails_blob_url(@event.resources_bundle.blob, disposition: "attachment") if @event.resources_bundle.attached?
-      = form.hidden_field :resources_bundle, value:@event.resources_bundle.signed_id if @event.resources_bundle.attached?
-      = form.input :resources_bundle, as: :file, wrapper: false, input_html: {direct_upload: true}, disabled: !:resources_bundle.in?(@event.fields_editable_by_participant)
+    = form.input :title, autofocus: true
+    = form.input :subtitle
+    = form.association :track, wrapper: :default, collection: current_conference.tracks.map { |track| [track.name, track.id, {title: track.description}] }
+    = form.input :length, hint: t('simple_form.hints.event.length', type: @event.event_type.name.mb_chars.downcase, min: @event.event_type.minimum_length, max: @event.event_type.maximum_length)
+    = form.input :language, as: :radio_buttons, collection: locale_collection, include_blank: false, wrapper: :default
+    = form.input :abstract
+    = form.input :description
+    = form.input :notes
 
     = form.input :agreement, as: :boolean, wrapper: :default