fix missing default schedule usage when making an agent
Andrew Cantino
променени са 2 файла, в които са добавени 6 реда и са изтрити 2 реда
+ 5
- 2
app/assets/javascripts/application.js.coffee.erb
@@ -25,7 +25,10 @@ hideSchedule = -> |
||
| 25 | 25 |
$(".schedule-region select").hide()
|
| 26 | 26 |
$(".schedule-region .cannot-be-scheduled").show()
|
| 27 | 27 |
|
| 28 |
-showSchedule = -> |
|
| 28 |
+showSchedule = (defaultSchedule = null) -> |
|
| 29 |
+ $(".schedule-region select").show()
|
|
| 30 |
+ if defaultSchedule? |
|
| 31 |
+ $(".schedule-region select").val(defaultSchedule).change()
|
|
| 29 | 32 |
$(".schedule-region select").show()
|
| 30 | 33 |
$(".schedule-region .cannot-be-scheduled").hide()
|
| 31 | 34 |
|
@@ -145,7 +148,7 @@ $(document).ready -> |
||
| 145 | 148 |
$(".event-descriptions").html("").hide()
|
| 146 | 149 |
$.getJSON "/agents/type_details", { type: $(@).val() }, (json) =>
|
| 147 | 150 |
if json.can_be_scheduled |
| 148 |
- showSchedule() |
|
| 151 |
+ showSchedule(json.default_schedule) |
|
| 149 | 152 |
else |
| 150 | 153 |
hideSchedule() |
| 151 | 154 |
|
+ 1
- 0
app/controllers/agents_controller.rb
@@ -34,6 +34,7 @@ class AgentsController < ApplicationController |
||
| 34 | 34 |
agent = Agent.build_for_type(params[:type], current_user, {})
|
| 35 | 35 |
render :json => {
|
| 36 | 36 |
:can_be_scheduled => agent.can_be_scheduled?, |
| 37 |
+ :default_schedule => agent.default_schedule, |
|
| 37 | 38 |
:can_receive_events => agent.can_receive_events?, |
| 38 | 39 |
:can_create_events => agent.can_create_events?, |
| 39 | 40 |
:options => agent.default_options, |