Rebased match

This commit is contained in:
Senad Uka
2020-06-15 11:02:51 +02:00
committed by bilal
parent c83e6cae0e
commit 16d4d7511c
4 changed files with 5 additions and 2 deletions

View File

@@ -56,6 +56,7 @@ class Account < ApplicationRecord
Broadcast.where(project: projects), Broadcast.where(project: projects),
ZoomMeeting.where(project: projects), ZoomMeeting.where(project: projects),
MedicalRelease.where(project: projects), MedicalRelease.where(project: projects),
# MatchingRequest.where(project: projects),
self self
])).sum(:byte_size).to_f ])).sum(:byte_size).to_f
end end

View File

@@ -26,7 +26,7 @@
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %> <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>
<p class="alert alert-info"><%= fa_icon("info-circle", text: t(".custom_fields.instructions")) %></p> <p class="alert alert-info"><%= fa_icon("info-circle", text: t(".custom_fields.instructions")) %></p>
<%= render "shared/custom_fields", form: form %> <%= render "shared/custom_fields", form: form %>

View File

@@ -144,6 +144,7 @@ feature 'User managing appearance releases' do
large_pdf_file = build_large_pdf_file large_pdf_file = build_large_pdf_file
attach_file import_appearance_release_field, Rails.root.join(large_pdf_file.path), visible: false attach_file import_appearance_release_field, Rails.root.join(large_pdf_file.path), visible: false
expect(page).to have_css('#upload-progress-container') expect(page).to have_css('#upload-progress-container')
expect(page).to have_content submit_create_button, wait: 30
click_button submit_create_button click_button submit_create_button
expect(page).to have_content matching_started expect(page).to have_content matching_started
end end

View File

@@ -131,7 +131,8 @@ RSpec.describe Account do
Broadcast, Broadcast,
Account, Account,
ZoomMeeting, ZoomMeeting,
MedicalRelease MedicalRelease,
MatchingRequest
] ]
Rails.application.eager_load! Rails.application.eager_load!
ActiveRecord::Base.descendants.each do |model| ActiveRecord::Base.descendants.each do |model|