Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
This commit is contained in:
commit
7f8a612a01
|
@ -1,8 +1,9 @@
|
|||
<% if params[:come_from] == "statistics_index" %>
|
||||
$("#sub_categories_list").html('<%= j(render :partial => "sub_categories_list") %>');
|
||||
<% else %>
|
||||
<% if @sub_categories.blank? %>
|
||||
$("#statistic_sub_category_id").hide();
|
||||
$('#statistic_sub_category_id option:selected').val('');
|
||||
<% elsif params[:come_from] == "statistics_index" %>
|
||||
$("#sub_categories_list").html('<%= j(render :partial => "sub_categories_list") %>');
|
||||
<% else %>
|
||||
<% if @sub_categories.present? %>
|
||||
$("#sub_category").show();
|
||||
|
@ -10,3 +11,4 @@
|
|||
$("#statistic_sub_category_id").show();
|
||||
$("#statistic_sub_category_id").html('<%= escape_javascript( render :partial => 'statistics/sub_category') %>');
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
Loading…
Reference in New Issue