optionally differentiate between option values and label when narrowing dependent values

assets/javascripts/reporting/filters.js

@@ -287,7 +287,9 @@ Reporting.Filters = {
             });
             // insert new values
             response.responseJSON.each(function (o) {
-              var value = (o === null ? "" : o);
+              var ary = [ (o === null ? "" : o) ].flatten();
+              var label = ary.first();
+              var value = ary.last();
               // cannot use .innerhtml due to IE wierdness
               $(selectBox).insert(new Element('option', {value: value}).update(value.escapeHTML()));
             });

lib/report/controller.rb

@@ -117,7 +117,7 @@ module Report::Controller
           :values => params[:values][dependency])
       end
       query.column(dependent)
-      values = [::I18n.t(:label_inactive)] + query.result.collect {|r| r.fields[dependent] }
+      values = [[::I18n.t(:label_inactive), '<<inactive>>']] + query.result.collect {|r| r.fields[dependent] }
       render :json => values.to_json
     end
   end