Attached Files | diffIssue31423_termAuth_log.diff [^] (13,885 bytes) 2015-11-11 11:02 [Show Content] [Hide Content]diff -r 179097246998 src-db/database/model/tables/OBMOBC_LOGCLIENT.xml
--- a/src-db/database/model/tables/OBMOBC_LOGCLIENT.xml Tue Nov 10 07:57:43 2015 -0600
+++ b/src-db/database/model/tables/OBMOBC_LOGCLIENT.xml Wed Nov 11 11:01:38 2015 +0100
@@ -49,6 +49,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="CACHE_SESSION_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="OBMOBC_LOGCLIENT_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 179097246998 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Nov 10 07:57:43 2015 -0600
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 11 11:01:38 2015 +0100
@@ -60,7 +60,7 @@
<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <POSITION><![CDATA[12]]></POSITION>
+<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <POSITION><![CDATA[9]]></POSITION>
<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -203,6 +203,39 @@
<!--12ED283D975944E7BB6B69852A66616D--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--12ED283D975944E7BB6B69852A66616D--></AD_COLUMN>
+<!--1546D863A0B64C8E9F287972FB47CF77--><AD_COLUMN>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_COLUMN_ID><![CDATA[1546D863A0B64C8E9F287972FB47CF77]]></AD_COLUMN_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <NAME><![CDATA[Cache session id]]></NAME>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <COLUMNNAME><![CDATA[Cache_Session_ID]]></COLUMNNAME>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_TABLE_ID><![CDATA[D669D497165B4A0CB9D382378BA8D0F5]]></AD_TABLE_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <SEQNO><![CDATA[160]]></SEQNO>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_ELEMENT_ID><![CDATA[182FD651C020405DB1BD65E863D61D24]]></AD_ELEMENT_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <POSITION><![CDATA[13]]></POSITION>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1546D863A0B64C8E9F287972FB47CF77--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1546D863A0B64C8E9F287972FB47CF77--></AD_COLUMN>
+
<!--1796EBC9F71E4CC38FFF2FC1124AD391--><AD_COLUMN>
<!--1796EBC9F71E4CC38FFF2FC1124AD391--> <AD_COLUMN_ID><![CDATA[1796EBC9F71E4CC38FFF2FC1124AD391]]></AD_COLUMN_ID>
<!--1796EBC9F71E4CC38FFF2FC1124AD391--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1393,7 +1426,7 @@
<!--A07898C9A2504F39AB630A3080776B70--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A07898C9A2504F39AB630A3080776B70--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--A07898C9A2504F39AB630A3080776B70--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--A07898C9A2504F39AB630A3080776B70--> <POSITION><![CDATA[13]]></POSITION>
+<!--A07898C9A2504F39AB630A3080776B70--> <POSITION><![CDATA[10]]></POSITION>
<!--A07898C9A2504F39AB630A3080776B70--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--A07898C9A2504F39AB630A3080776B70--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--A07898C9A2504F39AB630A3080776B70--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1459,7 +1492,7 @@
<!--A720E672C1434E809BF9A2C95C0E6291--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--A720E672C1434E809BF9A2C95C0E6291--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--A720E672C1434E809BF9A2C95C0E6291--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--A720E672C1434E809BF9A2C95C0E6291--> <POSITION><![CDATA[15]]></POSITION>
+<!--A720E672C1434E809BF9A2C95C0E6291--> <POSITION><![CDATA[12]]></POSITION>
<!--A720E672C1434E809BF9A2C95C0E6291--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--A720E672C1434E809BF9A2C95C0E6291--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--A720E672C1434E809BF9A2C95C0E6291--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1599,7 +1632,7 @@
<!--BF80D78F10434195B3E6B0E78724269D--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--BF80D78F10434195B3E6B0E78724269D--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--BF80D78F10434195B3E6B0E78724269D--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--BF80D78F10434195B3E6B0E78724269D--> <POSITION><![CDATA[14]]></POSITION>
+<!--BF80D78F10434195B3E6B0E78724269D--> <POSITION><![CDATA[11]]></POSITION>
<!--BF80D78F10434195B3E6B0E78724269D--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--BF80D78F10434195B3E6B0E78724269D--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--BF80D78F10434195B3E6B0E78724269D--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
diff -r 179097246998 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Tue Nov 10 07:57:43 2015 -0600
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 11 11:01:38 2015 +0100
@@ -24,6 +24,18 @@
<!--14C50DB073904C20AA8864E2F76D708E--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--14C50DB073904C20AA8864E2F76D708E--></AD_ELEMENT>
+<!--182FD651C020405DB1BD65E863D61D24--><AD_ELEMENT>
+<!--182FD651C020405DB1BD65E863D61D24--> <AD_ELEMENT_ID><![CDATA[182FD651C020405DB1BD65E863D61D24]]></AD_ELEMENT_ID>
+<!--182FD651C020405DB1BD65E863D61D24--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--182FD651C020405DB1BD65E863D61D24--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--182FD651C020405DB1BD65E863D61D24--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--182FD651C020405DB1BD65E863D61D24--> <COLUMNNAME><![CDATA[Cache_Session_ID]]></COLUMNNAME>
+<!--182FD651C020405DB1BD65E863D61D24--> <NAME><![CDATA[Unique cache session identifier]]></NAME>
+<!--182FD651C020405DB1BD65E863D61D24--> <PRINTNAME><![CDATA[Unique cache session identifier]]></PRINTNAME>
+<!--182FD651C020405DB1BD65E863D61D24--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--182FD651C020405DB1BD65E863D61D24--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--182FD651C020405DB1BD65E863D61D24--></AD_ELEMENT>
+
<!--496EBFE512C849FE8E2BD0C1B1D22F75--><AD_ELEMENT>
<!--496EBFE512C849FE8E2BD0C1B1D22F75--> <AD_ELEMENT_ID><![CDATA[496EBFE512C849FE8E2BD0C1B1D22F75]]></AD_ELEMENT_ID>
<!--496EBFE512C849FE8E2BD0C1B1D22F75--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 179097246998 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Tue Nov 10 07:57:43 2015 -0600
+++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Nov 11 11:01:38 2015 +0100
@@ -608,6 +608,33 @@
<!--69328821E9C74C519BDD20E5F6B0DC44--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--69328821E9C74C519BDD20E5F6B0DC44--></AD_FIELD>
+<!--76D547ED7B1342E9A11CA95522C67009--><AD_FIELD>
+<!--76D547ED7B1342E9A11CA95522C67009--> <AD_FIELD_ID><![CDATA[76D547ED7B1342E9A11CA95522C67009]]></AD_FIELD_ID>
+<!--76D547ED7B1342E9A11CA95522C67009--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--76D547ED7B1342E9A11CA95522C67009--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--76D547ED7B1342E9A11CA95522C67009--> <NAME><![CDATA[Cache session id]]></NAME>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--76D547ED7B1342E9A11CA95522C67009--> <AD_TAB_ID><![CDATA[14BDEAB664C146DCB662B2E3EA7A495E]]></AD_TAB_ID>
+<!--76D547ED7B1342E9A11CA95522C67009--> <AD_COLUMN_ID><![CDATA[1546D863A0B64C8E9F287972FB47CF77]]></AD_COLUMN_ID>
+<!--76D547ED7B1342E9A11CA95522C67009--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--76D547ED7B1342E9A11CA95522C67009--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--76D547ED7B1342E9A11CA95522C67009--> <SEQNO><![CDATA[35]]></SEQNO>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--76D547ED7B1342E9A11CA95522C67009--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--76D547ED7B1342E9A11CA95522C67009--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--76D547ED7B1342E9A11CA95522C67009--> <GRID_SEQNO><![CDATA[35]]></GRID_SEQNO>
+<!--76D547ED7B1342E9A11CA95522C67009--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--76D547ED7B1342E9A11CA95522C67009--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--76D547ED7B1342E9A11CA95522C67009--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--76D547ED7B1342E9A11CA95522C67009--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--76D547ED7B1342E9A11CA95522C67009--></AD_FIELD>
+
<!--79A32C43F3C34330A0F4A18C117D0256--><AD_FIELD>
<!--79A32C43F3C34330A0F4A18C117D0256--> <AD_FIELD_ID><![CDATA[79A32C43F3C34330A0F4A18C117D0256]]></AD_FIELD_ID>
<!--79A32C43F3C34330A0F4A18C117D0256--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 179097246998 web/org.openbravo.mobile.core/source/model/logclient.js
--- a/web/org.openbravo.mobile.core/source/model/logclient.js Tue Nov 10 07:57:43 2015 -0600
+++ b/web/org.openbravo.mobile.core/source/model/logclient.js Wed Nov 11 11:01:38 2015 +0100
@@ -17,9 +17,9 @@
entityName: 'LogClient',
source: 'org.openbravo.mobile.core.master.LogClient',
local: true,
- createStatement: 'CREATE TABLE IF NOT EXISTS obmobc_logclient (obmobc_logclient_id TEXT PRIMARY KEY, deviceId TEXT, msg TEXT, json CLOB, created TEXT, createdby TEXT)',
+ createStatement: 'CREATE TABLE IF NOT EXISTS obmobc_logclient (obmobc_logclient_id TEXT PRIMARY KEY, deviceId TEXT, cacheSessionId TEXT, msg TEXT, json CLOB, created TEXT, createdby TEXT)',
dropStatement: 'DROP TABLE IF EXISTS obmobc_logclient',
- insertStatement: 'INSERT INTO obmobc_logclient (obmobc_logclient_id, deviceId, msg, json, created, createdby) VALUES (?,?,?,?,?,?)',
+ insertStatement: 'INSERT INTO obmobc_logclient (obmobc_logclient_id, deviceId, cacheSessionId, msg, json, created, createdby) VALUES (?,?,?,?,?,?,?)',
serializeToJSON: function () {
return JSON.parse(JSON.stringify(this.toJSON()));
}
@@ -35,6 +35,10 @@
column: 'deviceId',
type: 'TEXT'
}, {
+ name: 'cacheSessionId',
+ column: 'cacheSessionId',
+ type: 'TEXT'
+ }, {
name: 'msg',
column: 'msg',
type: 'TEXT'
diff -r 179097246998 web/org.openbravo.mobile.core/source/utils/ob-utilities.js
--- a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js Tue Nov 10 07:57:43 2015 -0600
+++ b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js Wed Nov 11 11:01:38 2015 +0100
@@ -411,6 +411,10 @@
logClientModel.set('loglevel', level);
logClientModel.set('msg', msg);
logClientModel.set('deviceId', OB.MobileApp.model.get('logConfiguration').deviceIdentifier);
+ logClientModel.set('cacheSessionId', null);
+ if (window.localStorage.getItem('cacheSessionId') !== null) {
+ logClientModel.set('cacheSessionId', window.localStorage.getItem('cacheSessionId'));
+ }
logClientModel.set('link', OB.UTIL.getStackLink());
_.each(OB.MobileApp.model.get('logConfiguration').logPropertiesExtension, function (f) {
|