Pflichtenheftkostenschätzung: "Abbrechen" ohne AJAX-Call nur in JS

diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index 75453fbcdcc90f31929b477ef88fbfcd01885ac5..2a6413672362d36a72def5487f1491733bbb06db 100644 (file)
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -109,23 +109,14 @@ sub action_ajax_show_time_and_cost_estimate {
   $self->render('requirement_spec/_show_time_and_cost_estimate', { layout => 0 });
 }
 
   $self->render('requirement_spec/_show_time_and_cost_estimate', { layout => 0 });
 }
 

-sub action_ajax_cancel_time_and_cost_estimate {
-  my ($self) = @_;
-
-  my $html   = $self->render('requirement_spec/_show_time_and_cost_estimate', { output => 0 });
-
-  $self->js
-   ->replaceWith('#time_cost_estimate', $html)
-   ->render($self);
-}
-

 sub action_ajax_edit_time_and_cost_estimate {
   my ($self) = @_;
 
   my $html   = $self->render('requirement_spec/_edit_time_and_cost_estimate', { output => 0 });
 
   $self->js
 sub action_ajax_edit_time_and_cost_estimate {
   my ($self) = @_;
 
   my $html   = $self->render('requirement_spec/_edit_time_and_cost_estimate', { output => 0 });
 
   $self->js

-   ->replaceWith('#time_cost_estimate', $html)
+   ->hide('#time_cost_estimate')
+   ->after('#time_cost_estimate', $html)

    ->on('#time_cost_estimate INPUT[type=text]', 'keydown', 'kivi.requirement_spec.time_cost_estimate_input_key_down')
    ->render($self);
 }
    ->on('#time_cost_estimate INPUT[type=text]', 'keydown', 'kivi.requirement_spec.time_cost_estimate_input_key_down')
    ->render($self);
 }

diff --git a/js/requirement_spec.js b/js/requirement_spec.js
index b465ce094ec1f01ed0b5a82b71015ab6ca9fb470..d2a50523fba4aab47a1c7fa99399ce0b8d54abc3 100644 (file)
--- a/js/requirement_spec.js
+++ b/js/requirement_spec.js
@@ -326,8 +326,13 @@ ns.standard_basic_settings_ajax_call = function(key, opt) {
 // -------------------------------------------------------------------------
 
 ns.standard_time_cost_estimate_ajax_call = function(key, opt) {
 // -------------------------------------------------------------------------
 
 ns.standard_time_cost_estimate_ajax_call = function(key, opt) {

-  if ((key == 'cancel') && !confirm(kivi.t8('Do you really want to cancel?')))
+  if (key == 'cancel') {
+    if (confirm(kivi.t8('Do you really want to cancel?'))) {
+      $('#time_cost_estimate').show();
+      $('#time_cost_estimate_form_container').remove();
+    }

     return true;
     return true;

+  }

 
   var data = "action=RequirementSpec/ajax_" + key + "_time_and_cost_estimate&";
 
 
   var data = "action=RequirementSpec/ajax_" + key + "_time_and_cost_estimate&";
 

diff --git a/templates/webpages/requirement_spec/_edit_time_and_cost_estimate.html b/templates/webpages/requirement_spec/_edit_time_and_cost_estimate.html
index 1bd80929af14e0b7a90b90901dac27f4189cd7eb..a18efc09b918113d23cddf4fc9b837a776a27bc5 100644 (file)
--- a/templates/webpages/requirement_spec/_edit_time_and_cost_estimate.html
+++ b/templates/webpages/requirement_spec/_edit_time_and_cost_estimate.html
@@ -1,7 +1,7 @@
 [%- USE LxERP -%][%- USE L -%][%- USE HTML -%][%- USE P -%]
 [%- DEFAULT id_prefix = 'time_and_cost_estimate_form' %]
 
 [%- USE LxERP -%][%- USE L -%][%- USE HTML -%][%- USE P -%]
 [%- DEFAULT id_prefix = 'time_and_cost_estimate_form' %]
 

-<div id="time_cost_estimate" class="edit-time-cost-estimate-context-menu">
+<div id="time_cost_estimate_form_container" class="edit-time-cost-estimate-context-menu">

  [%- IF !SELF.requirement_spec.sections.size %]
   <p>[%- LxERP.t8("Neither sections nor function blocks have been created yet.") %]</p>
 
  [%- IF !SELF.requirement_spec.sections.size %]
   <p>[%- LxERP.t8("Neither sections nor function blocks have been created yet.") %]</p>