commit c8a58c8b4234ee7906840def39d0dc33a220b4b4
author Matteo Scandolo <matteo.scandolo@gmail.com> Thu Aug 17 17:14:38 2017 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Fri Aug 18 10:35:02 2017 -0700
tree bf4cb506dee333c9da2232826485e99632944596
parent 9f29cce552cebbe7f5d847a9ddaedc6f6e72de89

[CORD-1653] Adding a debug tab in model details

Change-Id: I6c3be4227309cbeb2dd7ab6252c1312dfd00fb18

src/app/core/services/helpers/config.helpers.ts

diff --git a/src/app/core/services/helpers/config.helpers.ts b/src/app/core/services/helpers/config.helpers.ts
index 81901e3..c177568 100644
--- a/src/app/core/services/helpers/config.helpers.ts
+++ b/src/app/core/services/helpers/config.helpers.ts
@@ -45,6 +45,7 @@
 
 export interface IXosConfigHelpersService {
   excluded_fields: string[];
+  form_excluded_fields: string[];
   modelFieldsToColumnsCfg(model: IXosModeldef): IXosTableColumn[];
   modelToTableCfg(model: IXosModeldef, modelName: string): IXosTableCfg;
   modelFieldToInputCfg(fields: IXosModelDefsField[]): IXosFormInput[];

src/app/core/services/keyboard-shortcut.spec.ts

diff --git a/src/app/core/services/keyboard-shortcut.spec.ts b/src/app/core/services/keyboard-shortcut.spec.ts
index a4a15dd..fa9bf41 100644
--- a/src/app/core/services/keyboard-shortcut.spec.ts
+++ b/src/app/core/services/keyboard-shortcut.spec.ts
@@ -157,7 +157,8 @@
         global: [
           {
             key: 'a',
-            cb: 'cb'
+            cb: 'cb',
+            modifiers: undefined
           }
         ],
         view: []

src/app/core/services/keyboard-shortcut.ts

diff --git a/src/app/core/services/keyboard-shortcut.ts b/src/app/core/services/keyboard-shortcut.ts
index 72a59a5..b8678f7 100644
--- a/src/app/core/services/keyboard-shortcut.ts
+++ b/src/app/core/services/keyboard-shortcut.ts
@@ -102,7 +102,6 @@
     $('body').on('keydown', (e) => {
 
       const pressedKey = this.whatKey(e.which);
-
       if (!pressedKey) {
         return;
       }
@@ -141,7 +140,7 @@
     }
 
     binding.key = binding.key.toLowerCase();
-    if (_.find(this.keyMapping.global, {key: binding.key}) || _.find(this.keyMapping.view, {key: binding.key})) {
+    if (_.find(this.keyMapping.global, {key: binding.key, modifiers: binding.modifiers}) || _.find(this.keyMapping.view, {key: binding.key, modifiers: binding.modifiers})) {
       this.$log.warn(`[XosKeyboardShortcut] A shortcut for key "${binding.key}" has already been registered`);
       return;
     }