From 57d2a05b7f7db7e2e716f8f00b140f02cafd9eac Mon Sep 17 00:00:00 2001
From: Ana <anamma06@gmail.com>
Date: Wed, 3 Aug 2016 22:02:37 +0200
Subject: [PATCH] Use of Rails usl helper instead of interpolation

I also eliminated a duplicated attribute in params
---
 app/assets/javascripts/osem-schedule.js | 19 +++++++++----------
 app/views/admin/schedule/show.html.haml |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/osem-schedule.js b/app/assets/javascripts/osem-schedule.js
index b090e401..44f0fa19 100644
--- a/app/assets/javascripts/osem-schedule.js
+++ b/app/assets/javascripts/osem-schedule.js
@@ -1,16 +1,16 @@
-var conference; // Should be initialize in Schedule.initialize
+var url; // Should be initialize in Schedule.initialize
 var schedule_id; // Should be initialize in Schedule.initialize
 
 var Schedule = {
-  initialize: function(conference_param, schedule_id_param) {
-    conference = conference_param;
+  initialize: function(url_param, schedule_id_param) {
+    url = url_param;
     schedule_id = schedule_id_param;
   },
   remove: function(element) {
     var e =  $("#" + element);
     var event_schedule_id = e.attr("event_schedule_id");
     if(event_schedule_id != null){
-      var url = '/admin/conference/' + conference + '/event_schedule/' + event_schedule_id;
+      var my_url = url + '/' + event_schedule_id;
       var params = {
         event: e.attr("guid"),
         schedule: schedule_id
@@ -20,7 +20,7 @@ var Schedule = {
         e.attr("event_schedule_id", null);
       }
       $.ajax({
-        url: url,
+        url: my_url,
         type: 'DELETE',
         data: params,
         success: callback,
@@ -32,19 +32,18 @@ var Schedule = {
     e.find(".schedule-event-delete-button").hide();
   },
   add: function (event_id, room_id, date, time, event_schedule_id) {
-    var url = '/admin/conference/' + conference + '/event_schedule';
+    my_url = url;
     var type = 'POST'
     if(event_schedule_id != null){
       type = 'PUT';
-      url += ('/' + event_schedule_id);
+      my_url += ('/' + event_schedule_id);
     }
     var params = {
       event: event_id,
       schedule: schedule_id,
       room: room_id,
       date: date,
-      time: time,
-      schedule: schedule_id
+      time: time
     };
     var callback = function(data) {
       console.log(data);
@@ -53,7 +52,7 @@ var Schedule = {
       e.find(".schedule-event-delete-button").show();
     }
     $.ajax({
-      url: url,
+      url: my_url,
       type: type,
       data: params,
       success: callback,
diff --git a/app/views/admin/schedule/show.html.haml b/app/views/admin/schedule/show.html.haml
index af527d67..1285b19a 100644
--- a/app/views/admin/schedule/show.html.haml
+++ b/app/views/admin/schedule/show.html.haml
@@ -9,7 +9,7 @@
   .col-md-2
     Selected schedule
     = check_box_tag @conference.short_title, @schedule_id, (@schedule_id == @selected_schedule_id),
-      method: :put, url: "/admin/conference/#{@conference.short_title}/schedule/#{@schedule_id}?selected_schedule=",
+      method: :put, url: (admin_conference_schedule_path(@conference.short_title, @schedule_id) + '?selected_schedule='),
       class: 'switch-checkbox', data: { size: 'small',
                                         off_color: 'warning',
                                         on_text: 'Yes',
@@ -32,5 +32,5 @@
 
 :javascript
   $(document).ready( function() {
-    Schedule.initialize("#{@conference.short_title}", "#{@schedule_id}");
+    Schedule.initialize("#{admin_conference_event_schedule_index_path(@conference)}", "#{@schedule_id}");
   });