fix MR comment

app/controllers/api/api_controller.rb

@@ -17,9 +17,7 @@ class Api::ApiController < ActionController::Base
   def return_error(exception)
     raise exception if Rails.env.test? 
 
-    Raven.capture_exception(exception)
-
-    logger.error "==Handled======"
+    logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
     logger.error "==Handled=======" 

app/controllers/api/medical_releases_controller.rb

@@ -1,11 +0,0 @@
-class Api::MedicalReleasesController < Api::ReleasesController
-  deserializable_resource :medical_release, only: [:create, :update]
-
-  def model_name
-    "medical_release"
-  end
-
-  def attributes_for_index
-    [:name]
-  end
-end

app/controllers/api/misc_releases_controller.rb

@@ -1,11 +0,0 @@
-class Api::MiscReleasesController < Api::ReleasesController
-  deserializable_resource :misc_release, only: [:create, :update]
-
-  def model_name
-    "misc_release"
-  end
-
-  def attributes_for_index
-    [:name]
-  end
-end

app/controllers/api/sync_controller.rb

@@ -10,10 +10,8 @@ class Api::SyncController < Api::ApiController
     @appearance_releases = (AppearanceRelease.where(project: accessible_projects))
     @location_releases = (LocationRelease.where(project: accessible_projects))
     @material_releases = (MaterialRelease.where(project: accessible_projects))
-    @medical_releases = MedicalRelease.where(project: accessible_projects)
-    @misc_releases = MiscRelease.where(project: accessible_projects)
     @talent_releases = (TalentRelease.where(project: accessible_projects))
-    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @medical_releases + @misc_releases + @talent_releases + @acquired_media_releases ))
+    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @talent_releases + @acquired_media_releases ))
 
     render json: {
       data: {
@@ -24,8 +22,6 @@ class Api::SyncController < Api::ApiController
         appearance_releases: releases_query(@appearance_releases),
         location_releases: releases_query(@location_releases),
         material_releases: releases_query(@material_releases),
-        medical_releases: releases_query(@medical_releases),
-        misc_releases: releases_query(@misc_releases),
         talent_releases: releases_query(@talent_releases),
         notes: @notes
       }

app/controllers/api/user_token_controller.rb

@@ -5,8 +5,6 @@ class Api::UserTokenController < Knock::AuthTokenController
 
   # Catch exception and return JSON-formatted error
   def return_error(exception)
-    Raven.capture_exception(exception)
-
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")

app/jobs/generate_contracts_zip_job.rb

@@ -22,7 +22,7 @@ class GenerateContractsZipJob < ApplicationJob
         end
       end
 
-      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
+      @download.file.attach(io: File.open(zipfile_name), filename: @folder_name)
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)

app/models/qr_code.rb

@@ -10,7 +10,7 @@ class QrCode
     url       = Rails.application.routes.url_helpers.url_for(route)
     filename  = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_")
 
-    new(url, "#{filename}.png")
+    new(url, filename)
   end
 
   def initialize(url, filename = "qrcode.png")

app/views/broadcasts/splash.html.erb

@@ -18,7 +18,15 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435943632" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
+            <table class="w-100 h-100 bg-secondary">
+              <tbody>
+              <tr>
+                <td class="text-center align-middle text-white">
+                  Video tutorial will be available soon
+                </td>
+              </tr>
+              </tbody>
+            </table>
           </div>
         </div>
       </div>

app/views/contract_templates/_contract_template.html.erb

@@ -27,7 +27,7 @@
           <%= link_to fa_icon("print", text: "Print"), [:new, contract_template, :blank_contracts], class: "dropdown-item", target: :_blank %>
         <% end %>
         <% if policy(contract_template).destroy? %>
-          <%= link_to fa_icon("trash", text: "Delete"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
+          <%= link_to fa_icon("archive", text: "Archive"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
         <% end %>
       </div>
     </div>

app/views/contract_templates/splash.html.erb

@@ -18,7 +18,15 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435942851" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
+            <table class="w-100 h-100 bg-secondary">
+              <tbody>
+              <tr>
+                <td class="text-center align-middle text-white">
+                  Video tutorial will be available soon
+                </td>
+              </tr>
+              </tbody>
+            </table>
           </div>
         </div>
       </div>

app/views/public/acquired_media_releases/new.html.erb

@@ -50,7 +50,7 @@
       <hr>
 
       <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text.present? ? @contract_template.signature_legal_text : nil %>
       <% end %>
 
       <div class="mt-5">

app/views/task_requests/create.html.erb

@@ -13,4 +13,3 @@
   <% end %>
 <% end %>
 <p class="alert alert-success p-3 lead text-center"><%= t '.success_message' %></p>
-<%= link_to fa_icon("check", text: "Done"), [@project, :task_requests], class: "btn btn-primary" %>

app/views/videos/splash.html.erb

@@ -6,7 +6,7 @@
 
   <%= link_to t(".actions.book_demo"), 'https://meetings.hubspot.com/bray2', class: "btn btn-primary border align-self-center h-50 ml-auto mr-2 pb-2", target: '_blank' %>
   <% if policy(Video).new? %>
-    <%= link_to t(".actions.upload_video"), [:landing, @project, :videos], class: "btn btn-success border align-self-center h-50 pb-2" %>
+    <%= link_to t(".actions.upload_video"), [:new, @project, :video], class: "btn btn-success border align-self-center h-50 pb-2" %>
   <% end %>
 </div>
 
@@ -18,7 +18,15 @@
       <div class="card-body p-0">
         <div class="embed-responsive embed-responsive-16by9">
           <div class="embed-responsive-item">
-            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435943995" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
+            <table class="w-100 h-100 bg-secondary">
+              <tbody>
+              <tr>
+                <td class="text-center align-middle text-white">
+                  Video tutorial will be available soon
+                </td>
+              </tr>
+              </tbody>
+            </table>
           </div>
         </div>
       </div>

config/routes.rb

@@ -2,7 +2,7 @@ require 'oath/constraints/signed_in'
 require 'sidekiq/web'
 
 Rails.application.routes.draw do
-  AVAILABLE_LOCALES_REGEX = /#{I18n.available_locales.join("|")}/.freeze
+  AVAILABLE_LOCALES_REGEX = /#{I18n.available_locales.join("|")}/
 
   concern :confirmable do
     resources :video_release_confirmations, only: [:new, :create, :destroy]
@@ -136,8 +136,8 @@ Rails.application.routes.draw do
       end
     end
 
-    RELEASES = [:acquired_media_releases, :appearance_releases, :talent_releases, :material_releases, :medical_releases, :misc_releases, :location_releases].freeze
-    ALL_RELEASES = RELEASES + [:music_releases]
+    RELEASES = [:acquired_media_releases, :appearance_releases, :talent_releases, :material_releases, :location_releases]
+    ALL_RELEASES = RELEASES + [:music_releases, :medical_releases, :misc_releases]
 
     ALL_RELEASES.each do |release|
       resources release, only: [], concerns: :taggable
@@ -158,7 +158,7 @@ Rails.application.routes.draw do
           resources :contract_templates, only: [:index]
         end
         resources :contract_templates, only: [:show] do
-          (RELEASES - [:misc_releases, :medical_releases]).each do |release|
+          RELEASES.each do |release|
             resources release, controller: release, only: [:create]
           end
         end

spec/controllers/api/medical_releases_controller_spec.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::MedicalReleasesController, type: :controller do
-  let(:current_user) { create(:user) }
-  let(:project) { create(:project, name: 'first', account: current_user.primary_account) }
-
-  describe '#index' do
-    it 'returns a succesful response' do
-      create(:medical_release, person_first_name: 'John', person_last_name: 'Lee', project_id: project.id)
-      create(:medical_release, person_first_name: 'Jane', person_last_name: 'Lee', project_id: project.id)
-
-      sign_in_to_api(current_user)
-      get :index, params: { project_id: project.id }
-
-      expect(response).to be_successful
-      expect(response.body).to include 'John'
-      expect(response.body).to include 'Jane'
-    end
-  end
-
-  describe '#show' do
-    it 'returns a succesful response' do
-      release1 = create(:medical_release, person_first_name: 'John', person_last_name: 'Lee', project_id: project.id)
-      release2 = create(:medical_release, person_first_name: 'Jane', person_last_name: 'Lee', project_id: project.id)
-
-      sign_in_to_api(current_user)
-      get :show, params: { id: release1 }
-
-      expect(response).to be_successful
-      expect(response.body).to include 'John'
-      expect(response.body).not_to include 'Jane'
-
-      get :show, params: { id: release2 }
-
-      expect(response).to be_successful
-      expect(response.body).not_to include 'John'
-      expect(response.body).to include 'Jane'
-    end
-  end
-end

spec/controllers/api/misc_releases_controller_spec.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::MiscReleasesController, type: :controller do
-  let(:current_user) { create(:user) }
-  let(:project) { create(:project, name: 'first', account: current_user.primary_account) }
-
-  describe '#index' do
-    it 'returns a succesful response' do
-      create(:misc_release, person_first_name: 'John', person_last_name: 'Lee', project_id: project.id)
-      create(:misc_release, person_first_name: 'Jane', person_last_name: 'Lee', project_id: project.id)
-
-      sign_in_to_api(current_user)
-      get :index, params: { project_id: project.id }
-
-      expect(response).to be_successful
-      expect(response.body).to include 'John'
-      expect(response.body).to include 'Jane'
-    end
-  end
-
-  describe '#show' do
-    it 'returns a succesful response' do
-      release1 = create(:misc_release, person_first_name: 'John', person_last_name: 'Lee', project_id: project.id)
-      release2 = create(:misc_release, person_first_name: 'Jane', person_last_name: 'Lee', project_id: project.id)
-
-      sign_in_to_api(current_user)
-      get :show, params: { id: release1 }
-
-      expect(response).to be_successful
-      expect(response.body).to include 'John'
-      expect(response.body).not_to include 'Jane'
-
-      get :show, params: { id: release2 }
-
-      expect(response).to be_successful
-      expect(response.body).not_to include 'John'
-      expect(response.body).to include 'Jane'
-    end
-  end
-end

spec/controllers/api/notes_controller_spec.rb

@@ -18,14 +18,6 @@ releases = [
   {
     type: :material_release,
     obligatory_attribute: :name
-  },
-  {
-    type: :medical_release,
-    obligatory_attribute: :person_name
-  },
-  {
-    type: :misc_release,
-    obligatory_attribute: :person_name
   }
 ]
 

spec/controllers/api/sync_controller_spec.rb

@@ -110,26 +110,6 @@ RSpec.describe Api::SyncController, type: :controller do
       expect(guardian_photo).to include('id', 'type', 'attributes')
       expect(photo_attributes).to include('filename', 'content_type', 'url', 'thumbnail_url')
     end
-
-    it 'contains misc releases' do
-      create_default_data
-
-      get :index
-
-      misc_releases = attributes_for_type('misc_releases')
-
-      expect(misc_releases.first).to include('id')
-    end
-
-    it 'contains misc releases' do
-      create_default_data
-
-      get :index
-
-      medical_releases = attributes_for_type('medical_releases')
-
-      expect(medical_releases.first).to include('id')
-    end
   end
 
   private
@@ -140,8 +120,6 @@ RSpec.describe Api::SyncController, type: :controller do
     create(:talent_release, project: project)
     create(:location_release, project: project)
     create(:material_release, project: project)
-    create(:medical_release, project: project)
-    create(:misc_release, project: project)
   end
 
   def create_default_data_with_guardian_info

spec/features/user_creates_task_request_spec.rb

@@ -21,7 +21,6 @@ RSpec.feature 'User creates task request', type: :feature do
     click_on 'Create Task request'
 
     expect(page).to have_content task_created_message
-    expect(page).to have_link("Done")
   end
 
   scenario 'user can view task request details' do
@@ -90,4 +89,4 @@ RSpec.feature 'User creates task request', type: :feature do
   def task_created_message
     t 'task_requests.create.success_message'
   end
-end
+end

spec/features/user_manages_contract_templates_spec.rb

@@ -240,7 +240,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
 
     click_on 'Manage'
     accept_alert do
-      click_on 'Delete'
+      click_on 'Archive'
     end
 
     expect(page).to have_content('The release template has been archived')
@@ -291,7 +291,7 @@ RSpec.feature 'User manages contract templates', type: :feature do
       visit project_contract_templates_path(project)
 
       click_on 'Manage'
-      expect(page).to have_content('Delete')
+      expect(page).to have_content('Archive')
     end
 
     it 'does not show create release button on splash page' do