Anpassungen an neues SL::File::Object Interface

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

diff --git a/SL/Controller/RequirementSpecTextBlock.pm b/SL/Controller/RequirementSpecTextBlock.pm
index 737f748e82e29114c5a2a3489a2895b05c0257cb..055281907042d8542badffa0507a6d2443f18887 100644 (file)
--- a/SL/Controller/RequirementSpecTextBlock.pm
+++ b/SL/Controller/RequirementSpecTextBlock.pm
@@ -8,7 +8,6 @@ use Carp;
 use Params::Validate ();
 use Time::HiRes ();
 
 use Params::Validate ();
 use Time::HiRes ();
 

-use SL::ClientJS;

 use SL::Clipboard;
 use SL::Controller::Helper::RequirementSpec;
 use SL::DB::RequirementSpec;
 use SL::Clipboard;
 use SL::Controller::Helper::RequirementSpec;
 use SL::DB::RequirementSpec;


@@ -23,9 +22,10 @@ use constant SORTABLE_PICTURE_LIST => 'kivi.requirement_spec.make_text_block_pic
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(text_block) ],
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(text_block) ],

-  'scalar --get_set_init' => [ qw(predefined_texts js picture) ],
+  'scalar --get_set_init' => [ qw(predefined_texts picture) ],

 );
 
 );
 

+__PACKAGE__->run_before('check_auth');

 __PACKAGE__->run_before('load_requirement_spec_text_block', only => [qw(ajax_edit ajax_update ajax_delete ajax_flag dragged_and_dropped ajax_copy ajax_add_picture)]);
 
 #
 __PACKAGE__->run_before('load_requirement_spec_text_block', only => [qw(ajax_edit ajax_update ajax_delete ajax_flag dragged_and_dropped ajax_copy ajax_add_picture)]);
 
 #


@@ -65,7 +65,7 @@ sub action_ajax_add {
 
   $self->add_new_text_block_form(output_position => $new_where, insert_after_id => $::form->{id}, requirement_spec_id => $::form->{requirement_spec_id});
 
 
   $self->add_new_text_block_form(output_position => $new_where, insert_after_id => $::form->{id}, requirement_spec_id => $::form->{requirement_spec_id});
 

-  $self->invalidate_version->render($self);
+  $self->invalidate_version->render;

 }
 
 sub action_ajax_edit {
 }
 
 sub action_ajax_edit {


@@ -184,7 +184,7 @@ sub action_dragged_and_dropped {
   my $dropped_type       = $position ne 'last' ? undef : $::form->{dropped_type} =~ m/^ text-blocks- (?:front|back) $/x ? $::form->{dropped_type} : die "Unknown 'dropped_type' parameter";
   my $old_where          = $self->text_block->output_position;
 
   my $dropped_type       = $position ne 'last' ? undef : $::form->{dropped_type} =~ m/^ text-blocks- (?:front|back) $/x ? $::form->{dropped_type} : die "Unknown 'dropped_type' parameter";
   my $old_where          = $self->text_block->output_position;
 

-  $self->text_block->db->do_transaction(sub {
+  $self->text_block->db->with_transaction(sub {

     1;
     $self->text_block->remove_from_list;
     $self->text_block->output_position($position =~ m/before|after/ ? $dropped_text_block->output_position : $::form->{dropped_type} eq 'text-blocks-front' ? 0 : 1);
     1;
     $self->text_block->remove_from_list;
     $self->text_block->output_position($position =~ m/before|after/ ? $dropped_text_block->output_position : $::form->{dropped_type} eq 'text-blocks-front' ? 0 : 1);


@@ -398,6 +398,11 @@ sub action_reorder_pictures {
 # filters
 #
 
 # filters
 #
 

+sub check_auth {
+  my ($self) = @_;
+  $::auth->assert('requirement_spec_edit');
+}
+

 sub load_requirement_spec_text_block {
   my ($self) = @_;
   $self->text_block(SL::DB::RequirementSpecTextBlock->new(id => $::form->{id})->load || die "No such requirement spec text block");
 sub load_requirement_spec_text_block {
   my ($self) = @_;
   $self->text_block(SL::DB::RequirementSpecTextBlock->new(id => $::form->{id})->load || die "No such requirement spec text block");


@@ -421,18 +426,13 @@ sub output_position_from_id {
 }
 
 sub init_predefined_texts {
 }
 
 sub init_predefined_texts {

-  return SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted;
+  return SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted(where => [ useable_for_text_blocks => 1 ]);

 }
 
 sub init_picture {
   return SL::DB::RequirementSpecPicture->new(id => $::form->{picture_id} || $::form->{id})->load;
 }
 
 }
 
 sub init_picture {
   return SL::DB::RequirementSpecPicture->new(id => $::form->{picture_id} || $::form->{id})->load;
 }
 

-sub init_js {
-  my ($self) = @_;
-  $self->js(SL::ClientJS->new);
-}
-

 sub invalidate_version {
   my ($self) = @_;
 
 sub invalidate_version {
   my ($self) = @_;
 


@@ -482,14 +482,14 @@ sub show_list {
 sub paste_picture {
   my ($self, $copied) = @_;
 
 sub paste_picture {
   my ($self, $copied) = @_;
 

-  if (!$self->text_block->db->do_transaction(sub {
+  if (!$self->text_block->db->with_transaction(sub {

     1;
     $self->picture($copied->to_object)->save;        # Create new picture from copied data and save
     $self->text_block->add_pictures($self->picture); # Add new picture to text block
     $self->text_block->save;
   })) {
     $::lxdebug->message(LXDebug::WARN(), "Error: " . $self->text_block->db->error);
     1;
     $self->picture($copied->to_object)->save;        # Create new picture from copied data and save
     $self->text_block->add_pictures($self->picture); # Add new picture to text block
     $self->text_block->save;
   })) {
     $::lxdebug->message(LXDebug::WARN(), "Error: " . $self->text_block->db->error);

-    return $self->js->error($::locale->text('Saving failed. Error message from the database: #1', $self->text_block->db->error))->render($self);
+    return $self->js->error($::locale->text('Saving failed. Error message from the database: #1', $self->text_block->db->error))->render;

   }
 
   my $html = $self->render('requirement_spec_text_block/_text_block_picture', { output => 0 }, picture => $self->picture);
   }
 
   my $html = $self->render('requirement_spec_text_block/_text_block_picture', { output => 0 }, picture => $self->picture);


@@ -497,7 +497,7 @@ sub paste_picture {
   $self->invalidate_version
     ->append('#text-block-' . $self->text_block->id . '-pictures', $html)
     ->show('#text-block-' . $self->text_block->id . '-pictures')
   $self->invalidate_version
     ->append('#text-block-' . $self->text_block->id . '-pictures', $html)
     ->show('#text-block-' . $self->text_block->id . '-pictures')

-    ->render($self);
+    ->render;

 }
 
 1;
 }
 
 1;