gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add new styles to be checked

Browse source
This commit is contained in:
Artem Chernikov 2014-07-30 23:43:00 +02:00
parent 6e7e0c2cd3
commit eb127b4f8c
4 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/event_attachments_controller.rb
View file

@ -66,11 +66,11 @@ class EventAttachmentsController < ApplicationController
respond_to do |format|
if @upload.save
format.html {
format.html do
render json: [@upload.to_jq_upload].to_json,
content_type: 'text/html',
layout: false
}
end
format.json do
render json: [@upload.to_jq_upload].to_json, status: :created,
location: conference_proposal_event_attachment_path(@upload.event.conference.short_title, @upload.event, @upload)

2
app/controllers/schedule_controller.rb
View file

@ -7,7 +7,7 @@ class ScheduleController < ApplicationController
@events = @conference.events
@dates = @conference.start_date..@conference.end_date
if @dates === Date.current
if @dates == Date.current
@today = Date.current.strftime("%Y-%m-%d")
else
@today = @conference.start_date.strftime("%Y-%m-%d")