X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpecTextBlock.pm;h=9fe3b9b83a4faf426b1ec55acd8122e8519381fb;hb=9f6877898cc76446ad4fe927075494a9789ed838;hp=eaf8b6fdcbf527f7c316c346d356507136acc8ee;hpb=90f4ba5dc6212592754cdddd082640103ee15884;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpecTextBlock.pm b/SL/Controller/RequirementSpecTextBlock.pm index eaf8b6fdc..9fe3b9b83 100644 --- a/SL/Controller/RequirementSpecTextBlock.pm +++ b/SL/Controller/RequirementSpecTextBlock.pm @@ -7,6 +7,7 @@ use parent qw(SL::Controller::Base); use Time::HiRes (); use SL::ClientJS; +use SL::Clipboard; use SL::DB::RequirementSpec; use SL::DB::RequirementSpecPredefinedText; use SL::DB::RequirementSpecTextBlock; @@ -15,11 +16,11 @@ use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( - scalar => [ qw(requirement_spec text_block) ], - 'scalar --get_set_init' => [ qw(predefined_texts) ], + scalar => [ qw(text_block) ], + 'scalar --get_set_init' => [ qw(predefined_texts js) ], ); -__PACKAGE__->run_before('load_requirement_spec_text_block', only => [qw(ajax_edit ajax_update ajax_delete ajax_flag dragged_and_dropped)]); +__PACKAGE__->run_before('load_requirement_spec_text_block', only => [qw(ajax_edit ajax_update ajax_delete ajax_flag dragged_and_dropped ajax_copy)]); # # actions @@ -41,25 +42,22 @@ sub action_ajax_list { # $::lxdebug->message(0, "cur $current_where new $new_where"); - my $js = SL::ClientJS->new; - if (!defined($current_where) || ($new_where != $current_where)) { my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $new_where, requirement_spec_id => $::form->{requirement_spec_id} ]); my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $new_where); - $js->html('#column-content', $html) + $self->js + ->html('#column-content', $html) ->val('#current_content_type', 'text-blocks-' . (0 == $new_where ? 'front' : 'back')) ->val('#current_content_id', $::form->{clicked_id}); } - $self->render($js); + $self->render($self->js); } sub action_ajax_add { my ($self) = @_; - my $js = SL::ClientJS->new; - my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; my $new_where = $self->output_position_from_id($::form->{id}) // $::form->{output_position}; @@ -67,7 +65,7 @@ sub action_ajax_add { my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $new_where, requirement_spec_id => $::form->{requirement_spec_id} ]); my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $new_where); - $js->html('#column-content', $html); + $self->js->html('#column-content', $html); } $self->text_block(SL::DB::RequirementSpecTextBlock->new( @@ -78,7 +76,8 @@ sub action_ajax_add { my $id_base = join('_', 'new_text_block', Time::HiRes::gettimeofday(), int rand 1000000000000); my $html = $self->render('requirement_spec_text_block/_form', { output => 0 }, id_base => $id_base, insert_after => $::form->{id}); - $js->action($::form->{id} ? 'insertAfter' : 'appendTo', $html, '#text-block-' . ($::form->{id} || 'list')) + $self->invalidate_version + ->action($::form->{id} ? 'insertAfter' : 'appendTo', $html, '#text-block-' . ($::form->{id} || 'list')) ->focus('#' . $id_base . '_title') ->render($self); } @@ -86,21 +85,21 @@ sub action_ajax_add { sub action_ajax_edit { my ($self) = @_; - my $js = SL::ClientJS->new; - my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; if ($self->text_block->output_position != $current_where) { my $text_blocks = $self->text_block->get_full_list; my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $self->text_block->output_position); - $js->html('#column-content', $html) + $self->js + ->html('#column-content', $html) ->val('#current_content_type', 'text-block') ->val('#current_content_id', $self->text_block->id); } my $html = $self->render('requirement_spec_text_block/_form', { output => 0 }); - $js->hide('#text-block-' . $self->text_block->id) + $self->js + ->hide('#text-block-' . $self->text_block->id) ->remove('#edit_text_block_' . $self->text_block->id . '_form') ->insertAfter($html, '#text-block-' . $self->text_block->id) ->jstree->select_node('#tree', '#tb-' . $self->text_block->id) @@ -123,9 +122,10 @@ sub action_ajax_create { my $html = $self->render('requirement_spec_text_block/_text_block', { output => 0 }, text_block => $self->text_block); my $node = $self->presenter->requirement_spec_text_block_jstree_data($self->text_block); - SL::ClientJS->new + $self->invalidate_version ->replaceWith('#' . $::form->{form_prefix} . '_form', $html) ->jstree->create_node('#tree', $insert_after ? ('#tb-' . $insert_after, 'after') : ('#tb-' . ($attributes->{output_position} == 0 ? 'front' : 'back'), 'last'), $node) + ->jstree->select_node('#tree', '#tb-' . $self->text_block->id) ->render($self); } @@ -146,7 +146,7 @@ sub action_ajax_update { my $html = $self->render('requirement_spec_text_block/_text_block', { output => 0 }, text_block => $self->text_block); - SL::ClientJS->new + $self->invalidate_version ->remove('#' . $prefix . '_form') ->replaceWith('#text-block-' . $self->text_block->id, $html) ->jstree->rename_node('#tree', '#tb-' . $self->text_block->id, $self->text_block->title) @@ -156,19 +156,19 @@ sub action_ajax_update { sub action_ajax_delete { my ($self) = @_; - my $js = SL::ClientJS->new; - my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; if ($self->text_block->output_position == $current_where) { - $js->remove('#edit_text_block_' . $self->text_block->id . '_form') + $self->js + ->remove('#edit_text_block_' . $self->text_block->id . '_form') ->remove('#text-block-' . $self->text_block->id); - $js->show('#text-block-list-empty') if 1 == scalar @{ $self->text_block->get_full_list }; + $self->js->show('#text-block-list-empty') if 1 == scalar @{ $self->text_block->get_full_list }; } $self->text_block->delete; - $js->jstree->delete_node('#tree', '#tb-' . $self->text_block->id) + $self->invalidate_version + ->jstree->delete_node('#tree', '#tb-' . $self->text_block->id) ->render($self); } @@ -203,12 +203,14 @@ sub action_dragged_and_dropped { # $::lxdebug->dump(0, "form", $::form); - return $self->render(\'', { type => 'json' }) if $::form->{current_content_type} !~ m/^text-block/; + $self->invalidate_version + ->jstree->open_node('#tree', '#tb-' . (!$self->text_block->output_position ? 'front' : 'back')); + + return $self->js->render($self) if $::form->{current_content_type} !~ m/^text-block/; my $current_where = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}) // -1; my $new_where = $self->text_block->output_position; my $id = $self->text_block->id; - my $js = SL::ClientJS->new; # $::lxdebug->message(0, "old $old_where current $current_where new $new_where current_CID " . $::form->{current_content_id} . ' selfid ' . $self->text_block->id); if (($old_where != $new_where) && ($::form->{current_content_id} == $self->text_block->id)) { @@ -217,45 +219,77 @@ sub action_dragged_and_dropped { my $text_blocks = SL::DB::Manager::RequirementSpecTextBlock->get_all_sorted(where => [ output_position => $new_where ]); my $html = $self->render('requirement_spec_text_block/ajax_list', { output => 0 }, TEXT_BLOCKS => $text_blocks, output_position => $new_where); - $js->val('#current_content_type', 'text-blocks-' . ($new_where == 0 ? 'front' : 'back')) + $self->js + ->val('#current_content_type', 'text-blocks-' . ($new_where == 0 ? 'front' : 'back')) ->html('#column-content', $html); } else { if ($old_where == $current_where) { - $js->remove('#text-block-' . $self->text_block->id); + $self->js->remove('#text-block-' . $self->text_block->id); if (0 == scalar(@{ SL::DB::Manager::RequirementSpecTextBlock->get_all(where => [ requirement_spec_id => $self->text_block->requirement_spec_id, output_position => $current_where ]) })) { - $js->show('#text-block-list-empty'); + $self->js->show('#text-block-list-empty'); } } if ($new_where == $current_where) { - $js->hide('#text-block-list-empty'); + $self->js->hide('#text-block-list-empty'); my $html = "" . $self->render('requirement_spec_text_block/_text_block', { output => 0 }, text_block => $self->text_block); $html =~ s/^\s+//; my $prior_text_block = $self->text_block->get_previous_in_list; if ($prior_text_block) { - $js->insertAfter($html, '#text-block-' . $prior_text_block->id); + $self->js->insertAfter($html, '#text-block-' . $prior_text_block->id); } else { - $js->prependTo($html, '#text-block-list'); + $self->js->prependTo($html, '#text-block-list'); } } } - $self->render($js); + $self->js->render($self); +} + +sub action_ajax_copy { + my ($self, %params) = @_; + + SL::Clipboard->new->copy($self->text_block); + SL::ClientJS->new->render($self); +} + +sub action_ajax_paste { + my ($self, %params) = @_; + + my $copied = SL::Clipboard->new->get_entry(qr/^RequirementSpecTextBlock$/); + if (!$copied) { + return SL::ClientJS->new + ->error(t8("The clipboard does not contain anything that can be pasted here.")) + ->render($self); + } + + my $current_output_position = $self->output_position_from_id($::form->{current_content_id}, $::form->{current_content_type}); + my $new_output_position = $::form->{id} ? $self->output_position_from_id($::form->{id}) : $::form->{output_position}; + my $front_back = 0 == $new_output_position ? 'front' : 'back'; + + $self->text_block($copied->to_object); + $self->text_block->update_attributes(requirement_spec_id => $::form->{requirement_spec_id}, output_position => $new_output_position); + $self->text_block->add_to_list(position => 'after', reference => $::form->{id}) if $::form->{id}; + + if ($current_output_position == $new_output_position) { + my $html = $self->render('requirement_spec_text_block/_text_block', { output => 0 }, text_block => $self->text_block); + $self->js->action($::form->{id} ? 'insertAfter' : 'appendTo', $html, '#text-block-' . ($::form->{id} || 'list')); + } + + my $node = $self->presenter->requirement_spec_text_block_jstree_data($self->text_block); + $self->invalidate_version + ->jstree->create_node('#tree', $::form->{id} ? ('#tb-' . $::form->{id}, 'after') : ("#tb-${front_back}", 'last'), $node) + ->render($self); } # # filters # -sub load_requirement_spec { - my ($self) = @_; - $self->requirement_spec(SL::DB::RequirementSpec->new(id => $::form->{requirement_spec_id})->load || die "No such requirement spec"); -} - 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"); @@ -273,7 +307,7 @@ sub output_position_from_id { return undef if $type !~ m/text-block/; } - my $text_block = SL::DB::Manager::RequirementSpecTextBlock->find_by(id => $id); + my $text_block = $id ? SL::DB::Manager::RequirementSpecTextBlock->find_by(id => $id) : undef; return $text_block ? $text_block->output_position : undef; } @@ -282,4 +316,17 @@ sub init_predefined_texts { return SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted; } +sub init_js { + my ($self) = @_; + $self->js(SL::ClientJS->new); +} + +sub invalidate_version { + my ($self) = @_; + + my $html = $self->render('requirement_spec/_version', { output => 0 }, + requirement_spec => SL::DB::RequirementSpec->new(id => $::form->{requirement_spec_id} || $self->text_block->requirement_spec_id)->load); + return $self->js->html('#requirement_spec_version', $html); +} + 1;