Merge branch 'master' of https://github.com/gabrielbaez/redmine_charts

Author: unknown

app/controllers/charts_burndown2_controller.rb

@@ -5,7 +5,7 @@ class ChartsBurndown2Controller < ChartsController
   protected
 
   def get_data
-    @conditions[:fixed_version_ids] ||= get_current_fixed_version_in(@project.id)
+    @conditions[:fixed_version_ids] ||= get_current_fixed_version_in(@project)
 
     version = unless @conditions[:fixed_version_ids].empty?
       Version.first(:conditions => {:id => @conditions[:fixed_version_ids][0]})
@@ -204,15 +204,15 @@ def get_multiconditions_options
 
   private
 
-  def get_current_fixed_version_in(project_id)
-    version = Version.all(:conditions => {:project_id => project_id}).detect do |version|
+  def get_current_fixed_version_in(project)
+    version = Version.all(:conditions => {:project_id => project.id}).detect do |version|
       version.created_on.to_date <= Date.current && !version.effective_date.nil? && version.effective_date >= Date.current
     end
     if version
       [version.id]
     else
-      versions = RedmineCharts::ConditionsUtils.to_options([:fixed_version_ids])[:fixed_version_ids]
-      unless versions.empty?
+      versions = RedmineCharts::ConditionsUtils.to_options(project, [:fixed_version_ids])[:fixed_version_ids]
+      unless versions.nil? || versions.empty?
         [versions.first[1]]
       else
         []

app/controllers/charts_controller.rb

@@ -35,15 +35,15 @@ def index
     @textconditions_options = []
 
     unless get_conditions_options.empty?
-      @conditions_options = RedmineCharts::ConditionsUtils.to_options(get_conditions_options)
+      @conditions_options = RedmineCharts::ConditionsUtils.to_options(@project, get_conditions_options)
       @textconditions_options = @conditions_options.select { |c1,c2| c2.nil? }
       @conditions_options = @conditions_options.select { |c1,c2| not c2.nil? }
     else
       @conditions_options = []
     end
 
     unless get_multiconditions_options.empty?
-      @multiconditions_options = RedmineCharts::ConditionsUtils.to_options(get_multiconditions_options)
+      @multiconditions_options = RedmineCharts::ConditionsUtils.to_options(@project, get_multiconditions_options)
       @textconditions_options = @multiconditions_options.select { |c1,c2| c2.nil? }
       @multiconditions_options = @multiconditions_options.select { |c1,c2| not c2.nil? }
     else

app/views/charts/_filters.rhtml

@@ -25,6 +25,12 @@ function toggle_filter(field) {
     } else {
       Element.hide('tr_' + field)
       values.disable();
+      select = $('add_filter_select'); //gets the drop down list element
+      for (i=0; i<select.options.length; i++) { //iterating through the options in drop down list
+        if (select.options[i].value == field) { //If de-seclected element found
+            select.options[i].disabled = false; //set disabled = false
+        }
+      }
     }
 }
 //]]>
@@ -33,7 +39,7 @@ function toggle_filter(field) {
 <table width="100%"><tr><td><table>
   <% unless @grouping_options.empty? %>
     <tr><td style="width:200px;"><label for="grouping"><%= l(:charts_group_by) %></label></td>
-    <td><%= select_tag :grouping, options_for_select(@grouping_options, @grouping), { :class => "select-small", :style => "width:200px" } %></td></tr>
+    <td><%= select_tag :grouping, options_for_select(@grouping_options, @grouping), { :class => "select-small" } %></td></tr>
   <% end %>
   <% @textconditions_options.each do |condition| %>
     <tr id="<%= "tr_#{condition[0]}" %>" class="filter"><td style="width:200px;">
@@ -49,7 +55,7 @@ function toggle_filter(field) {
       <label for="<%= "cb_#{condition[0]}" %>"><%= l("charts_condition_#{condition[0]}".gsub(".","_").to_sym) %></label>
     </td>
     <td><% unless condition[1].nil? %>
-      <%= select_tag condition[0].to_sym, options_for_select(condition[1], @conditions[condition[0].to_sym]), { :class => "select-small", :style => "width:200px", :id => "values_#{condition[0]}" } %>
+      <%= select_tag condition[0].to_sym, options_for_select(condition[1], @conditions[condition[0].to_sym]), { :class => "select-small", :id => "values_#{condition[0]}" } %>
     <% end %></td></tr>
     <script type="text/javascript">toggle_filter('<%= condition[0] %>');</script>
   <% end %>
@@ -59,7 +65,7 @@ function toggle_filter(field) {
       <label for="<%= "cb_#{condition[0]}" %>"><%= l("charts_condition_#{condition[0]}".gsub(".","_").to_sym) %></label>
     </td>
     <td><% unless condition[1].nil? %>
-      <%= select_tag condition[0].to_sym, options_for_select(condition[1], @conditions[condition[0].to_sym]), {:multiple => true, :class => "select-small", :style => "width:200px", :id => "values_#{condition[0]}"} %>
+      <%= select_tag condition[0].to_sym, options_for_select(condition[1], @conditions[condition[0].to_sym]), {:multiple => true, :class => "select-small", :id => "values_#{condition[0]}"} %>
     <% end %></td></tr>
     <script type="text/javascript">toggle_filter('<%= condition[0] %>');</script>
   <% end %>