Wiederkehrende Rechnungen: Berechnung maximales Enddatum gefixt

[kivitendo-erp.git] / js / requirement_spec.js

diff --git a/js/requirement_spec.js b/js/requirement_spec.js
index 96a2cba..5078971 100644 (file)
--- a/js/requirement_spec.js
+++ b/js/requirement_spec.js
@@ -444,9 +444,13 @@ ns.standard_basic_settings_ajax_call = function(key, opt) {
   if (key == 'cancel') {
     if (confirm(kivi.t8('Do you really want to cancel?'))) {
       $('#basic_settings').show();
-      $('#basic_settings_form').remove();
+      $('#basic_settings_form,#project_link_form').remove();
     }
     return true;
+
+  } else if (key == 'save') {
+    $('#basic_settings_form_submit').click();
+    return true;
   }
 
   var data = 'action=RequirementSpec/ajax_' + key + '&id=' + encodeURIComponent($('#requirement_spec_id').val());
@@ -469,7 +473,13 @@ ns.standard_time_cost_estimate_ajax_call = function(key, opt) {
     return true;
   }
 
-  var data = "action=RequirementSpec/ajax_" + key + "_time_and_cost_estimate&";
+  var add_data = '';
+  if (key == 'save_keep_open') {
+    key      = 'save';
+    add_data = 'keep_open=1&';
+  }
+
+  var data = "action=RequirementSpec/ajax_" + key + "_time_and_cost_estimate&" + add_data;
 
   if (key == 'save')
     data += $('#edit_time_cost_estimate_form').serialize()
@@ -678,6 +688,14 @@ ns.create_context_menus = function(is_template) {
       , delete_reqspec:  { name: kivi.t8('Delete template'), icon: "delete", callback: kivi.requirement_spec.delete_reqspec }
     };
 
+    $.contextMenu({
+      selector: '.basic-settings-context-menu',
+      items:    $.extend({
+          heading: { name: kivi.t8('Basic settings actions'), className: 'context-menu-heading' }
+        , edit:    { name: kivi.t8('Edit'), icon: "edit", callback: kivi.requirement_spec.standard_basic_settings_ajax_call }
+      }, general_actions)
+    });
+
   } else {                      // if (is_template)
     var general_actions = {
         sep98:              "---------"
@@ -699,6 +717,24 @@ ns.create_context_menus = function(is_template) {
       }, general_actions)
     });
 
+    $.contextMenu({
+      selector: '.basic-settings-context-menu',
+      items:    $.extend({
+          heading:           { name: kivi.t8('Basic settings actions'), className: 'context-menu-heading' }
+        , edit:              { name: kivi.t8('Edit'),              icon: "edit", callback: kivi.requirement_spec.standard_basic_settings_ajax_call }
+        , edit_project_link: { name: kivi.t8('Edit project link'),               callback: kivi.requirement_spec.standard_basic_settings_ajax_call }
+      }, general_actions)
+    });
+
+    $.contextMenu({
+      selector: '.edit-project-link-context-menu',
+      items:    $.extend({
+          heading: { name: kivi.t8('Project link actions'), className: 'context-menu-heading' }
+        , save:    { name: kivi.t8('Save'),   icon: "save",  callback: kivi.requirement_spec.standard_basic_settings_ajax_call }
+        , cancel:  { name: kivi.t8('Cancel'), icon: "close", callback: kivi.requirement_spec.standard_basic_settings_ajax_call }
+      }, general_actions)
+    });
+
     var paste_template_actions = {
     };
   }                             // if (is_template) ... else ...
@@ -741,14 +777,6 @@ ns.create_context_menus = function(is_template) {
     }, general_actions)
   });
 
-  $.contextMenu({
-    selector: '.basic-settings-context-menu',
-    items:    $.extend({
-        heading: { name: kivi.t8('Basic settings actions'), className: 'context-menu-heading' }
-      , edit:    { name: kivi.t8('Edit'), icon: "edit", callback: kivi.requirement_spec.standard_basic_settings_ajax_call }
-    }, general_actions)
-  });
-
   $.contextMenu({
     selector: '.edit-basic-settings-context-menu',
     items:    $.extend({
@@ -771,6 +799,7 @@ ns.create_context_menus = function(is_template) {
     items:    $.extend({
         heading: { name: kivi.t8('Time/cost estimate actions'), className: 'context-menu-heading' }
       , save:    { name: kivi.t8('Save'),   icon: "save",  callback: kivi.requirement_spec.standard_time_cost_estimate_ajax_call }
+      , save_keep_open: { name: kivi.t8('Save and keep open'), icon: "save", callback: kivi.requirement_spec.standard_time_cost_estimate_ajax_call }
       , cancel:  { name: kivi.t8('Cancel'), icon: "close", callback: kivi.requirement_spec.standard_time_cost_estimate_ajax_call }
     }, general_actions)
   });