Merge branch 'feature/dependent' of https://dev.finn.de/git/reporting-engine into feature/dependent

pull/6827/head
Tim Felgentreff 14 years ago
commit 59058decc6
  1. 2
      assets/javascripts/reporting/filters.js
  2. 1
      config/locales/de.yml
  3. 1
      config/locales/en.yml
  4. 8
      lib/report/operator.rb

@ -85,7 +85,7 @@ Reporting.Filters = {
change_argument_visibility: function (field, arg_nr) {
var params, i;
params = [$(field + '_arg_1'), $(field + '_arg_2')];
params = [$(field + '_arg_1_val'), $(field + '_arg_2_val')];
for (i = 0; i < 2; i += 1) {
if (params[i] !== null) {

@ -3,6 +3,7 @@ de:
units: Einheiten
label_less: "<"
label_greater: ">"
label_any: "alle"
label_report: "Report"
label_columns: "Spalten"
label_rows: "Zeilen"

@ -3,6 +3,7 @@ en:
units: Units
label_less: "<"
label_greater: ">"
label_any: "is any"
label_report: "Report"
label_columns: "Columns"
label_rows: "Rows"

@ -174,6 +174,12 @@ class Report::Operator
end
end
new "any", :label => :label_any, :arity => 0 do
def modify(query, field, value = nil)
query
end
end
end
#############################################################################################
@ -230,7 +236,7 @@ class Report::Operator
end
def self.default_operators
["=", "!"].map { |s| s.to_operator}
["=", "!", "any"].map { |s| s.to_operator}
end
attr_reader :name

Loading…
Cancel
Save