X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpecVersion.pm;h=e97d2252b6effc7a020ac2d98390af750144387b;hb=93cc0157161476f242f3304b1950f80d0ba5ef08;hp=7a5c6f275d5f669e189859bec2338f8b3cb473cb;hpb=79cbb4767ac442f3561cb5fc7319667a9eb33636;p=kivitendo-erp.git diff --git a/SL/Controller/RequirementSpecVersion.pm b/SL/Controller/RequirementSpecVersion.pm index 7a5c6f275..e97d2252b 100644 --- a/SL/Controller/RequirementSpecVersion.pm +++ b/SL/Controller/RequirementSpecVersion.pm @@ -17,7 +17,7 @@ use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(requirement_spec version js versioned_copies) ], + 'scalar --get_set_init' => [ qw(requirement_spec version js) ], ); __PACKAGE__->run_before('check_auth'); @@ -60,7 +60,7 @@ sub action_new { $self->version->description(@lines ? join("\n", @lines) : t8('No changes since previous version.')); } - $self->render('requirement_spec_version/new', { layout => 0 }, title => t8('Create a new version')); + $self->render('requirement_spec_version/new', { layout => 0 }); } sub action_create { @@ -72,18 +72,21 @@ sub action_create { return $self->js->error(@errors)->render($self) if @errors; my $db = $self->requirement_spec->db; - my @result = $self->version($self->requirement_spec->create_version(%attributes)); + my @result = $self->requirement_spec->create_version(%attributes); if (!@result) { $::lxdebug->message(LXDebug::WARN(), "Error: " . $db->error); return $self->js->error($::locale->text('Saving failed. Error message from the database: #1'), $db->error)->render($self); } - my $html = $self->render('requirement_spec/_version', { output => 0 }, requirement_spec => $self->requirement_spec); + $self->version($result[0]); + my $version_info_html = $self->render('requirement_spec/_version', { output => 0 }, requirement_spec => $self->requirement_spec); + my $version_list_html = $self->render('requirement_spec_version/list', { output => 0 }); $self->js - ->html('#requirement_spec_version', $html) - ->jqmClose('.jqmWindow') + ->html('#requirement_spec_version', $version_info_html) + ->html('#versioned_copies_list', $version_list_html) + ->dialog->close('#jqueryui_popup_dialog') ->render($self); } @@ -93,7 +96,7 @@ sub action_create { sub check_auth { my ($self, %params) = @_; - $::auth->assert('sales_quotation_edit'); + $::auth->assert('requirement_spec_edit'); } # @@ -115,13 +118,6 @@ sub init_js { $self->js(SL::ClientJS->new); } -sub init_versioned_copies { - my ($self) = @_; - $self->versioned_copies([ - sort { $b->mtime <=> $a->mtime } @{ $self->requirement_spec->versioned_copies } - ]); -} - sub has_item_changed { my ($previous, $current) = @_; croak "Missing previous/current" if !$previous || !$current;