diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ee0b043..037d529 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -16,23 +16,10 @@ class ApplicationController < ActionController::Base end end - private def authenticate_user_from_token! - if request.headers["HTTP_AUTHORIZATION"] - authenticate_or_request_with_http_token do |token, options| - email = token.split[1].split("=")[1] - token = token.split[0] - user_email = email.presence - end - else - user_email = params[:user_email].presence - token = params[:user_token] - end - log_it_in(token, user_email) - end - - def log_it_in(token, user_email) + user_email = params[:user_email].presence + token = params[:user_token] user = user_email && User.find_by_email(user_email) if user && Devise.secure_compare(user.authentication_token, token) sign_in user, store: false diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb index 864a95f..54e2fbd 100644 --- a/app/views/campaigns/_videolisting.html.erb +++ b/app/views/campaigns/_videolisting.html.erb @@ -25,10 +25,11 @@ <% end %> <% unless videolisting.asseturls.empty? %>
asseturls
+
asseturls
<% videolisting.asseturls_array.each do |asset| %>
- <%= asset[:asseturl] %>
Listing Code
<%= @campaign.listingcode %>
Description
<%= @campaign.description %>
Products & Services
<%= @campaign.productsandservices %>
Websiteurl
<%= @campaign.websiteurl %>
Client Services Rep
<%= @campaign.vpa %>
Billing Code
<%= @campaign.billingcode %>
Email Address
<%= @campaign.emailaddress %>
Business Phone
<%= number_to_phone @campaign.businessphone %>
Contact Phone
<%= number_to_phone @campaign.contactphone %>
Customer First Name
<%= @campaign.customerfirstname %>
Customer Last Name
<%= @campaign.customerlastname %>
Address
<%= @campaign.address %>
City, State, Zip
<%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %>
Awards
<%= @campaign.awards %>
Background
<%= @campaign.background %>
Industry Categories
<%= @campaign.categories %>
Company Colors
<%= @campaign.companycolors %>
Facebook URL
<%= @campaign.facebookurl %>
Target Audience
<%= @campaign.targetaudience %>
Tollfree Phone
<%= @campaign.tollfreephone %>
No Video Listings for this Campaign.