From a565a09172071783174450cea5a425964f3b6aa6 Mon Sep 17 00:00:00 2001
From: Robert Zorko <robertz@gurucue.com>
Date: Tue, 29 Sep 2015 15:29:42 +0200
Subject: added settings to the global codeq object and they are updated when
 the user logs into the application

---
 js/codeq/core.js  | 2 ++
 js/codeq/login.js | 8 ++++++++
 2 files changed, 10 insertions(+)

(limited to 'js')

diff --git a/js/codeq/core.js b/js/codeq/core.js
index 1685dd7..ef3648f 100644
--- a/js/codeq/core.js
+++ b/js/codeq/core.js
@@ -199,6 +199,8 @@
 
         'log': log,
 
+        'settings':{},
+
         'availableLangs': [], // filled at boot from 'supportedLangs'
         'supportedLangs': {
             'en': 'English',
diff --git a/js/codeq/login.js b/js/codeq/login.js
index bb92325..02a6517 100644
--- a/js/codeq/login.js
+++ b/js/codeq/login.js
@@ -14,6 +14,14 @@
                 $('#disabled').css('display', 'none');
                 $('#disabled').css('cursor', '');
                 if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message);
+
+                //merge these settings into the already existing default settings
+                sett = data.settings;
+                $.merge(true, codeq.settings, sett);
+                if('lang' in sett && sett['lan'] in codeq.supportedLangs){
+                    codeq.setLang(sett['lan']);
+                }
+
                 codeq.globalStateMachine.transition('language');
                 //codeq.activateState('language');
             })
-- 
cgit v1.2.1