Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added ternary to determine the presence of document #549

Merged
merged 5 commits into from
Jul 11, 2016
Merged

added ternary to determine the presence of document #549

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c40a34
added ternary to the presence of document
Jul 6, 2016
c41bde4
added ternary to determine the presence of document
Jul 6, 2016
77c2782
migrations
Jul 6, 2016
7b7575f
Merge branch 'master' of github.com:sparc-request/sparc-request into …
Jul 7, 2016
07542c8
Merge branch 'ml-edit_document_upload_bug' of github.com:sparc-reques…
Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions app/controllers/service_requests_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def catalog
def protocol
cookies.delete :current_step
@service_request.update_attribute(:service_requester_id, current_user.id) if @service_request.service_requester_id.nil?

if session[:saved_protocol_id]
@service_request.protocol = Protocol.find session[:saved_protocol_id]
session.delete :saved_protocol_id
Expand Down Expand Up @@ -585,12 +585,13 @@ def document_save_update errors
process_ssr_organization_ids = params[:process_ssr_organization_ids]
document_id = params[:document_id]
doc_object = Document.find(document_id) if document_id
document = params[:document]
document = params[:document].present? || !params[:document_id].present? ? params[:document] : doc_object.document
doc_type = params[:doc_type]
doc_type_other = params[:doc_type_other]
upload_clicked = params[:upload_clicked]
doc_type_valid = !doc_type.empty? && (doc_type != 'other' || (doc_type == 'other' && !doc_type_other.empty?))

if !doc_type.empty? && process_ssr_organization_ids && document
if doc_type_valid && process_ssr_organization_ids && document
# have all required ingredients for successful document
if document_id # update existing document
org_ids = doc_object.sub_service_requests.map{|ssr| ssr.organization_id.to_s}
Expand Down Expand Up @@ -634,12 +635,13 @@ def document_save_update errors
end
end

elsif upload_clicked == "1" && ((doc_type == "" || !process_ssr_organization_ids) || !document)
elsif upload_clicked == "1" && ((doc_type == "" || !process_ssr_organization_ids) || !document || doc_type == 'other' && doc_type_other.empty?)
# collect errors
doc_errors = {}
doc_errors[:recipients] = ["You must select at least one recipient"] if !process_ssr_organization_ids
doc_errors[:document] = ["You must select a document to upload"] if !document
doc_errors[:doc_type] = ["You must provide a document type"] if doc_type == ""
doc_errors[:doc_type_other] = ["You must specify the document type"] if doc_type == 'other' && doc_type_other.empty?
errors << doc_errors
end
end
Expand Down