Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / Controller / CustomDataExportDesigner.pm

diff --git a/SL/Controller/CustomDataExportDesigner.pm b/SL/Controller/CustomDataExportDesigner.pm
index 0ab25f7f9e0113483253ec5ba40da3bdebb3d245..53045485a4d898561e3a9776e9a12855579a9ba2 100644 (file)
--- a/SL/Controller/CustomDataExportDesigner.pm
+++ b/SL/Controller/CustomDataExportDesigner.pm
@@ -27,13 +27,13 @@ sub action_list {
   my ($self) = @_;
 
   $self->setup_list_action_bar;
-  $self->render('custom_data_export_designer/list', title => $::locale->text('Design custom data export queries'));
+  $self->render('custom_data_export_designer/list', title => $::locale->text('Design custom report queries'));
 }
 
 sub action_edit {
   my ($self) = @_;
 
-  my $title = $self->query->id ? t8('Edit custom data export query') : t8('Add custom data export query');
+  my $title = $self->query->id ? t8('Edit custom report query') : t8('Add custom report query');
 
   $self->setup_edit_action_bar;
   $self->render('custom_data_export_designer/edit', title => $title);
@@ -42,7 +42,7 @@ sub action_edit {
 sub action_edit_parameters {
   my ($self) = @_;
 
-  my $title     = $self->query->id ? t8('Edit custom data export query') : t8('Add custom data export query');
+  my $title     = $self->query->id ? t8('Edit custom report query') : t8('Add custom report query');
   my @parameters = $self->gather_query_data;
 
   $self->setup_edit_parameters_action_bar;
@@ -58,7 +58,7 @@ sub action_save {
 
   $self->query->save;
 
-  flash_later('info', t8('The custom data export has been saved.'));
+  flash_later('info', t8('The custom report has been saved.'));
 
   $self->redirect_to($self->url_for(action => 'list'));
 }
@@ -68,7 +68,7 @@ sub action_delete {
 
   $self->query->delete;
 
-  flash_later('info', t8('The custom data export has been deleted.'));
+  flash_later('info', t8('The custom report has been deleted.'));
 
   $self->redirect_to($self->url_for(action => 'list'));
 }
@@ -82,7 +82,7 @@ sub check_auth {
 }
 
 sub setup_javascripts {
-  $::request->layout->add_javascripts('kivi.Validator.js');
+  $::request->layout->add_javascripts('kivi.Validator.js', 'kivi.CustomDataExportDesigner.js');
 }
 
 #
@@ -181,13 +181,13 @@ sub gather_query_parameters {
   my %used_parameter_names  = map  { ($_ => 1) }                       $self->query->used_parameter_names;
   my @existing_parameters   = grep { $used_parameter_names{$_->name} } @{ $self->query->parameters // [] };
   my %parameters_by_name    = map  { ($_->name => $_) }                @existing_parameters;
-  $parameters_by_name{$_} //= SL::DB::CustomDataExportQueryParameter->new(name => $_, parameter_type => 'text') for keys %used_parameter_names;
+  $parameters_by_name{$_} //= SL::DB::CustomDataExportQueryParameter->new(name => $_, parameter_type => 'text', default_value_type => 'none') for keys %used_parameter_names;
 
   foreach my $parameter_data (@{ $::form->{parameters} // [] }) {
     my $parameter_obj = $parameters_by_name{ $parameter_data->{name} };
     next unless $parameter_obj;
 
-    $parameter_obj->$_($parameter_data->{$_}) for qw(parameter_type description);
+    $parameter_obj->$_($parameter_data->{$_}) for qw(parameter_type description default_value_type default_value);
   }
 
   return sort_by { lc $_->name } values %parameters_by_name;