From bfcf7fced3cd3c225a9472ae3009306c57637173 Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Sat, 25 Jun 2016 22:20:13 +0200 Subject: [PATCH] - fixed signature groupId/typeId "overwriting" for already known signatures. closed #207 - improved system search dialog. Added trim(); before "api/signatures-> search" request --- app/main/controller/api/signature.php | 8 ++++++++ js/app/ui/form_element.js | 2 +- public/js/v1.1.1/app/ui/form_element.js | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/main/controller/api/signature.php b/app/main/controller/api/signature.php index 65dbca89..4aaf769e 100644 --- a/app/main/controller/api/signature.php +++ b/app/main/controller/api/signature.php @@ -162,6 +162,14 @@ class Signature extends Controller\AccessController{ unset( $data['typeId'] ); } + // "sig reader" should not overwrite signature group information + if( + $data['groupId'] == 0 && + $signature->groupId > 0 + ){ + unset($data['groupId']); + } + $newData = $data; } diff --git a/js/app/ui/form_element.js b/js/app/ui/form_element.js index 8bab28e1..1c629ea3 100644 --- a/js/app/ui/form_element.js +++ b/js/app/ui/form_element.js @@ -63,7 +63,7 @@ define([ ajax: { url: function(params){ // add params to URL - return Init.path.searchSystem + '/' + params.term; + return Init.path.searchSystem + '/' + params.term.trim(); }, dataType: 'json', delay: 250, diff --git a/public/js/v1.1.1/app/ui/form_element.js b/public/js/v1.1.1/app/ui/form_element.js index 8bab28e1..1c629ea3 100644 --- a/public/js/v1.1.1/app/ui/form_element.js +++ b/public/js/v1.1.1/app/ui/form_element.js @@ -63,7 +63,7 @@ define([ ajax: { url: function(params){ // add params to URL - return Init.path.searchSystem + '/' + params.term; + return Init.path.searchSystem + '/' + params.term.trim(); }, dataType: 'json', delay: 250,