From b5540d5ca32797bf4701a92b63ceb385725cb04c Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap@edeveloper.nl>
Date: Wed, 14 Mar 2018 12:40:48 +0100
Subject: [PATCH] cancel and save and goback fixed.
---
ang/form_processor/FormProcessorEditCtrl.html | 2 +-
ang/form_processor/FormProcessorEditCtrl.js | 8 ++++++--
form_processor.php | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ang/form_processor/FormProcessorEditCtrl.html b/ang/form_processor/FormProcessorEditCtrl.html
index 97667bf..5c2fdd8 100644
--- a/ang/form_processor/FormProcessorEditCtrl.html
+++ b/ang/form_processor/FormProcessorEditCtrl.html
@@ -46,7 +46,7 @@ Required vars: formProcessor
<button crm-icon="fa-check" ng-click="save(true);" ng-disabled="editFormProcessorForm.$invalid || !isNameValid">
{{ts('Save and close')}}
</button>
- <button crm-icon="fa-times" ng-click="editFormProcessorForm.$setPristine(); goto('formProcessors')">
+ <button crm-icon="fa-times" ng-click="editFormProcessorForm.$setPristine(); goback();">
{{ts('Cancel')}}
</button>
</div>
diff --git a/ang/form_processor/FormProcessorEditCtrl.js b/ang/form_processor/FormProcessorEditCtrl.js
index 59afdc1..8745ecc 100644
--- a/ang/form_processor/FormProcessorEditCtrl.js
+++ b/ang/form_processor/FormProcessorEditCtrl.js
@@ -42,7 +42,7 @@
}
);
- angular.module('form_processor').controller('FormProcessorEditCtrl', function($scope, formProcessorFactory, dialogService, crmApi, apiCalls, $q, $timeout) {
+ angular.module('form_processor').controller('FormProcessorEditCtrl', function($scope, formProcessorFactory, dialogService, crmApi, apiCalls, $location, $q, $timeout) {
var ts = $scope.ts = CRM.ts(null);
$scope.formProcessor = apiCalls.formProcessor;
@@ -112,11 +112,15 @@
$scope.editFormProcessorForm.$setPristine();
if (goBack) {
- window.location.href = '#/formprocessors';
+ $scope.goback();
}
});
};
+ $scope.goback = function () {
+ $location.path('/formprocessors');
+ };
+
$scope.saveInputs = function(inputs, deletedInputs, api, formProcessor) {
angular.forEach(deletedInputs, function(input, key) {
if (input.id) {
diff --git a/form_processor.php b/form_processor.php
index a77080b..c6f8d8e 100644
--- a/form_processor.php
+++ b/form_processor.php
@@ -143,6 +143,7 @@ function form_processor_civicrm_navigationMenu(&$params) {
$posOfAdminMenu = array_search($administerMenuId, array_keys($params));
$newNavId = _form_processor_getMenuKeyMax($params);
+
$formProcessorMenu = array(
$newNavId => array(
'attributes' => array(
--
GitLab