X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpecItem.pm;h=c6026ce08d7e677120b1887019e4e12f6d46aad3;hb=da300db2eb33f9aa35bef69784b9d9d3ee0c92c8;hp=9b8f6436bbae18a7b3740d637dd1a9f446992aa8;hpb=3fbb0b9bbc37dbbe10407a858c58148e2d835c2c;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpecItem.pm b/SL/Controller/RequirementSpecItem.pm index 9b8f6436b..c6026ce08 100644 --- a/SL/Controller/RequirementSpecItem.pm +++ b/SL/Controller/RequirementSpecItem.pm @@ -14,6 +14,7 @@ use SL::Controller::Helper::RequirementSpec; use SL::DB::RequirementSpec; use SL::DB::RequirementSpecComplexity; use SL::DB::RequirementSpecItem; +use SL::DB::RequirementSpecPredefinedText; use SL::DB::RequirementSpecRisk; use SL::Helper::Flash; use SL::JSON; @@ -22,7 +23,7 @@ use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(item visible_item visible_section clicked_item sections) ], - 'scalar --get_set_init' => [ qw(complexities risks js) ], + 'scalar --get_set_init' => [ qw(complexities risks predefined_texts) ], ); __PACKAGE__->run_before('check_auth'); @@ -38,7 +39,7 @@ sub action_ajax_list { if (!$::form->{clicked_id}) { # Clicked on "sections" in the tree. Do nothing. - return $self->render($self->js); + return $self->render; } my $clicked_item = SL::DB::RequirementSpecItem->new(id => $::form->{clicked_id})->load; @@ -97,7 +98,7 @@ sub action_dragged_and_dropped { my $new_section = $self->item->section; my $new_visible_section = SL::DB::RequirementSpecItem->new(id => $self->visible_item->id)->load->section; - return $self->invalidate_version->render($self) if !$old_visible_section || ($new_type eq 'section'); + return $self->invalidate_version->render if !$old_visible_section || ($new_type eq 'section'); # From here on $old_visible_section is definitely set. @@ -496,7 +497,7 @@ sub action_ajax_paste { sub check_auth { my ($self) = @_; - $::auth->assert('sales_quotation_edit'); + $::auth->assert('requirement_spec_edit'); } sub load_requirement_spec_item { @@ -528,9 +529,8 @@ sub init_risks { return SL::DB::Manager::RequirementSpecRisk->get_all_sorted; } -sub init_js { - my ($self) = @_; - $self->js(SL::ClientJS->new); +sub init_predefined_texts { + return SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted(where => [ useable_for_sections => 1 ]); } sub replace_bottom { @@ -704,7 +704,7 @@ sub add_function_block { $self->js->show('#sub-function-block-container-' . $parent_id) if $new_type eq 'sub-function-block'; $self->add_new_item_form(insert_position => $insert_position, insert_reference => $insert_reference, display_reference => $display_reference); - $self->js->render($self); + $self->js->render; } sub is_item_visible {