From 00727c190a7609739d2f3da513a5cb20bf0e14a6 Mon Sep 17 00:00:00 2001
From: AnkushMalik <ankushmalik631@gmail.com>
Date: Tue, 26 Dec 2017 00:24:36 +0530
Subject: [PATCH] Change paths of two buttons on conference show page

Update path of track submission btn to track#new and proposal submission to proposal#new
Closes #1813, Closes #1920
---
 app/views/conferences/_call_for_papers.haml | 2 +-
 app/views/conferences/_call_for_tracks.haml | 2 +-
 app/views/conferences/show.html.haml        | 2 +-
 db/schema.rb                                | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/conferences/_call_for_papers.haml b/app/views/conferences/_call_for_papers.haml
index 3bf0f295..b47d7118 100644
--- a/app/views/conferences/_call_for_papers.haml
+++ b/app/views/conferences/_call_for_papers.haml
@@ -23,5 +23,5 @@
         left!
     %p.cta-button
       = link_to "Submit your proposal now",
-        conference_program_proposals_path(conference_id),
+        new_conference_program_proposal_path(conference_id),
         class: 'btn btn-success btn-lg text-center'
diff --git a/app/views/conferences/_call_for_tracks.haml b/app/views/conferences/_call_for_tracks.haml
index 7eb80fa6..6d78bd05 100644
--- a/app/views/conferences/_call_for_tracks.haml
+++ b/app/views/conferences/_call_for_tracks.haml
@@ -15,5 +15,5 @@
         left!
     %p.cta-button
       = link_to("Submit your request for track",
-        conference_program_tracks_path(conference_id),
+        new_conference_program_track_path(conference_id),
         class: 'btn btn-success btn-lg text-center')
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index d43c99cf..ea99b419 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -29,7 +29,7 @@
     - if @conference.registration_open?
       = render 'registration', conference: @conference,
         registration_period: @conference.registration_period,
-        tickets: @tickets, conference_id: @conference_id.short_title
+        tickets: @tickets, conference_id: @conference.short_title
   - if @conference.splashpage.include_tickets && @conference.tickets.any?
     = render 'tickets', conference: @conference, tickets: @tickets
 
diff --git a/db/schema.rb b/db/schema.rb
index 43602f9b..c3499d40 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -215,8 +215,8 @@ ActiveRecord::Schema.define(version: 20171130172334) do
     t.integer  "schedule_id"
     t.integer  "room_id"
     t.datetime "start_time"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
     t.boolean  "enabled",     default: true
     t.index ["event_id", "schedule_id"], name: "index_event_schedules_on_event_id_and_schedule_id", unique: true
     t.index ["event_id"], name: "index_event_schedules_on_event_id"