inprove timetable combinations

3 files changed, 5 insertions, 5 deletions

diff --git a/app/views/time_table_combinations/_combine.html.erb b/app/views/time_table_combinations/_combine.html.erb
index 3257cf812..85fc5ab26 100644
--- a/app/views/time_table_combinations/_combine.html.erb
+++ b/app/views/time_table_combinations/_combine.html.erb
@@ -5,9 +5,7 @@
         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
         <h4 class="modal-title" id="myModalLabel"><%= t('time_tables.show.combine_form') %></h4>
       </div>
-      <% @time_table_combination.clean %>
       <%= render "time_table_combinations/combine_form" %>
-
     </div>
   </div>
 
diff --git a/app/views/time_table_combinations/create_failure.js.erb b/app/views/time_table_combinations/create_failure.js.erb
new file mode 100644
index 000000000..65cc241c5
--- /dev/null
+++ b/app/views/time_table_combinations/create_failure.js.erb
@@ -0,0 +1,5 @@
+
+var combine_form_partial = '<%= j render "time_table_combinations/combine_form" %> ';
+
+$('#new_time_table_combination').replaceWith(combine_form_partial);
+
diff --git a/app/views/time_table_combinations/create.js.erb b/app/views/time_table_combinations/create_success.js.erb
index 06655deea..79ab543d9 100644
--- a/app/views/time_table_combinations/create.js.erb
+++ b/app/views/time_table_combinations/create_success.js.erb
@@ -3,9 +3,6 @@ var combine_form_partial = '<%= j render "time_table_combinations/combine_form"
 
 $('#new_time_table_combination').replaceWith(combine_form_partial);
 
-<% if @time_table_combination.status %>
-
 var time_table_partial = '<%= j render "time_tables/show_time_table" %> ';
 $('#time_table_show').replaceWith(time_table_partial);
 
-<% end %>