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

Use of Rails usl helper instead of interpolation

Browse source 
I also eliminated a duplicated attribute in params
This commit is contained in:
Ana 2016-08-03 22:02:37 +02:00
parent a578167cf5
commit 57d2a05b7f
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/osem-schedule.js
View file

@ -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_id; // Should be initialize in Schedule.initialize
var Schedule = { var Schedule = {
initialize: function(conference_param, schedule_id_param) { initialize: function(url_param, schedule_id_param) {
conference = conference_param; url = url_param;
schedule_id = schedule_id_param; schedule_id = schedule_id_param;
}, },
remove: function(element) { remove: function(element) {
var e = $("#" + element); var e = $("#" + element);
var event_schedule_id = e.attr("event_schedule_id"); var event_schedule_id = e.attr("event_schedule_id");
if(event_schedule_id != null){ if(event_schedule_id != null){
var url = '/admin/conference/' + conference + '/event_schedule/' + event_schedule_id; var my_url = url + '/' + event_schedule_id;
var params = { var params = {
event: e.attr("guid"), event: e.attr("guid"),
schedule: schedule_id schedule: schedule_id
@ -20,7 +20,7 @@ var Schedule = {
e.attr("event_schedule_id", null); e.attr("event_schedule_id", null);
} }
$.ajax({ $.ajax({
url: url, url: my_url,
type: 'DELETE', type: 'DELETE',
data: params, data: params,
success: callback, success: callback,
@ -32,19 +32,18 @@ var Schedule = {
e.find(".schedule-event-delete-button").hide(); e.find(".schedule-event-delete-button").hide();
}, },
add: function (event_id, room_id, date, time, event_schedule_id) { add: function (event_id, room_id, date, time, event_schedule_id) {
var url = '/admin/conference/' + conference + '/event_schedule'; my_url = url;
var type = 'POST' var type = 'POST'
if(event_schedule_id != null){ if(event_schedule_id != null){
type = 'PUT'; type = 'PUT';
url += ('/' + event_schedule_id); my_url += ('/' + event_schedule_id);
} }
var params = { var params = {
event: event_id, event: event_id,
schedule: schedule_id, schedule: schedule_id,
room: room_id, room: room_id,
date: date, date: date,
time: time, time: time
schedule: schedule_id
}; };
var callback = function(data) { var callback = function(data) {
console.log(data); console.log(data);
@ -53,7 +52,7 @@ var Schedule = {
e.find(".schedule-event-delete-button").show(); e.find(".schedule-event-delete-button").show();
} }
$.ajax({ $.ajax({
url: url, url: my_url,
type: type, type: type,
data: params, data: params,
success: callback, success: callback,

4
app/views/admin/schedule/show.html.haml
View file

@ -9,7 +9,7 @@
.col-md-2 .col-md-2
Selected schedule Selected schedule
= check_box_tag @conference.short_title, @schedule_id, (@schedule_id == @selected_schedule_id), = 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', class: 'switch-checkbox', data: { size: 'small',
off_color: 'warning', off_color: 'warning',
on_text: 'Yes', on_text: 'Yes',
@ -32,5 +32,5 @@
:javascript :javascript
$(document).ready( function() { $(document).ready( function() {
Schedule.initialize("#{@conference.short_title}", "#{@schedule_id}"); Schedule.initialize("#{admin_conference_event_schedule_index_path(@conference)}", "#{@schedule_id}");
}); });