Fix various Multi-Domain bugs
This commit is contained in:
Gary Sharp
@@ -2,7 +2,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.34011
|
||||
// Runtime Version:4.0.30319.34014
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
@@ -354,77 +354,81 @@ WriteLiteral("\';\r\n var isLive = false;\r\n\r\n function pageVie
|
||||
" {\r\n return urlManuallyAssign + \'#\' + self.sessionId + \'_\' + self" +
|
||||
".pageNumber;\r\n });\r\n self.assignedDataUrl = ko.computed(fu" +
|
||||
"nction () {\r\n var t = self.assignedDataType();\r\n v" +
|
||||
"ar dId = self.assignedDataId();\r\n switch (t) {\r\n " +
|
||||
" case \'Device\':\r\n return urlDeviceShow + dId;\r\n " +
|
||||
" case \'Job\':\r\n return urlJobShow + dId;\r\n " +
|
||||
" case \'User\':\r\n return urlUserShow + dId;\r\n" +
|
||||
" }\r\n return null;\r\n });\r\n se" +
|
||||
"lf.thumbnailUrl = ko.computed(function () {\r\n var enabled = self." +
|
||||
"thumbnailEnabled();\r\n if (enabled > 0) {\r\n ret" +
|
||||
"urn \'url(\' + urlPageThumbnail + \'?SessionId=\' + self.sessionId + \'&PageNumber=\' " +
|
||||
"+ self.pageNumber + \'&NoCache=\' + enabled + \')\';\r\n }\r\n " +
|
||||
" return null;\r\n });\r\n }\r\n\r\n function parseLog(log) " +
|
||||
"{\r\n if (log.ModuleId === 40 && log.Arguments && log.Arguments.length " +
|
||||
"> 0) {\r\n // find session\r\n var sessionId = log.Arg" +
|
||||
"uments[0];\r\n var session = vm.sessionIndex[sessionId];\r\n " +
|
||||
" if (!session && log.EventTypeId === 10) { // Starting Session (Ignore \'pa" +
|
||||
"rtial\' sessions)\r\n session = new sessionViewModel(log.Argumen" +
|
||||
"ts[1]);\r\n vm.sessionIndex[sessionId] = session;\r\n " +
|
||||
" vm.sessions.unshift(session);\r\n vm.noSessions(false);" +
|
||||
"\r\n }\r\n if (session) {\r\n switch " +
|
||||
"(log.EventTypeId) {\r\n case 10: // SessionStarting\r\n " +
|
||||
" session.startTime(log.FormattedTimestamp.substring(log.For" +
|
||||
"mattedTimestamp.indexOf(\' \') + 1));\r\n break;\r\n " +
|
||||
" case 11: // SessionProgress\r\n sessio" +
|
||||
"n.progressValue(log.Arguments[1]);\r\n session.progress" +
|
||||
"Status(log.Arguments[2]);\r\n break;\r\n " +
|
||||
" case 12: // SessionFinished\r\n session.sessionE" +
|
||||
"nded(true);\r\n session.progressStatus(\'Import Finished" +
|
||||
"\');\r\n break;\r\n case 15: // Ses" +
|
||||
"sionWarning\r\n session.messages.unshift(log);\r\n " +
|
||||
" break;\r\n case 16: // SessionError\r\n " +
|
||||
" session.messages.unshift(log);\r\n " +
|
||||
" break;\r\n case 100: // ImportPageStarting\r\n " +
|
||||
" session.addSessionPage(new sessionPageViewModel(sessionId, l" +
|
||||
"og.Arguments[1]));\r\n break;\r\n " +
|
||||
"case 104: // ImportPageImageUpdate\r\n var p = session." +
|
||||
"sessionPagesIndex[log.Arguments[1]];\r\n if (p) {\r\n " +
|
||||
" p.updateThumbnail();\r\n }\r" +
|
||||
"\n break;\r\n case 105: // Import" +
|
||||
"PageProgress\r\n var p = session.sessionPagesIndex[log." +
|
||||
"Arguments[1]];\r\n if (p) {\r\n " +
|
||||
" p.progressValue(log.Arguments[2]);\r\n p.prog" +
|
||||
"ressStatus(log.Arguments[3]);\r\n }\r\n " +
|
||||
" break;\r\n case 110: // ImportPageDetected\r\n " +
|
||||
" var p = session.sessionPagesIndex[log.Arguments[1]];\r\n " +
|
||||
" if (p) {\r\n p.documentTem" +
|
||||
"plateId(log.Arguments[2]);\r\n p.documentTemplate(l" +
|
||||
"og.Arguments[3]);\r\n p.assignedDataType(log.Argume" +
|
||||
"nts[4]);\r\n p.assignedDataId(log.Arguments[5]);\r\n " +
|
||||
" p.assignedData(log.Arguments[6]);\r\n " +
|
||||
" p.detected(true);\r\n if (!isLive" +
|
||||
") {\r\n p.updateThumbnail();\r\n " +
|
||||
" }\r\n }\r\n ses" +
|
||||
"sion.messages.unshift(log);\r\n break;\r\n " +
|
||||
" case 115: // ImportPageUndetected\r\n var p = " +
|
||||
"session.sessionPagesIndex[log.Arguments[1]];\r\n if (p)" +
|
||||
" {\r\n p.undetected(true);\r\n " +
|
||||
" if (!isLive) {\r\n p.updateThumbnail()" +
|
||||
";\r\n }\r\n }\r\n " +
|
||||
" session.messages.unshift(log);\r\n bre" +
|
||||
"ak;\r\n case 150: // Ignore: ImportPageUndetectedStored\r\n " +
|
||||
" break;\r\n default:\r\n " +
|
||||
" session.messages.unshift(log);\r\n }\r\n " +
|
||||
" }\r\n }\r\n }\r\n function init() {\r\n // Cr" +
|
||||
"eate View Model\r\n vm = new pageViewModel();\r\n\r\n // Load Lo" +
|
||||
"gs\r\n var d = new Date();\r\n var loadData = {\r\n " +
|
||||
" Format: \"json\",\r\n Start: d.getFullYear() + \'-\' + (d.getMonth()" +
|
||||
" + 1) + \'-\' + d.getDate(),\r\n End: null,\r\n ModuleId" +
|
||||
": 40,\r\n Take: 2000\r\n };\r\n $.ajax({\r\n " +
|
||||
" url: \'");
|
||||
"ar dId = self.assignedDataId();\r\n if (dId !== undefined) {\r\n " +
|
||||
" switch (t) {\r\n case \'Device\':\r\n " +
|
||||
" return urlDeviceShow + dId;\r\n case \'Job\'" +
|
||||
":\r\n return urlJobShow + dId;\r\n " +
|
||||
" case \'User\':\r\n if (dId.indexOf(\'\\\\\') < 0)\r\n " +
|
||||
" return urlUserShow + dId;\r\n el" +
|
||||
"se\r\n return urlUserShow + dId.substr(dId.indexOf(" +
|
||||
"\'\\\\\') + 1) + \'?domain=\' + dId.substr(0, dId.indexOf(\'\\\\\'));\r\n " +
|
||||
" }\r\n }\r\n return null;\r\n });\r\n " +
|
||||
" self.thumbnailUrl = ko.computed(function () {\r\n var enabled = s" +
|
||||
"elf.thumbnailEnabled();\r\n if (enabled > 0) {\r\n " +
|
||||
" return \'url(\' + urlPageThumbnail + \'?SessionId=\' + self.sessionId + \'&PageNumbe" +
|
||||
"r=\' + self.pageNumber + \'&NoCache=\' + enabled + \')\';\r\n }\r\n " +
|
||||
" return null;\r\n });\r\n }\r\n\r\n function parseLog(l" +
|
||||
"og) {\r\n if (log.ModuleId === 40 && log.Arguments && log.Arguments.len" +
|
||||
"gth > 0) {\r\n // find session\r\n var sessionId = log" +
|
||||
".Arguments[0];\r\n var session = vm.sessionIndex[sessionId];\r\n " +
|
||||
" if (!session && log.EventTypeId === 10) { // Starting Session (Ignore" +
|
||||
" \'partial\' sessions)\r\n session = new sessionViewModel(log.Arg" +
|
||||
"uments[1]);\r\n vm.sessionIndex[sessionId] = session;\r\n " +
|
||||
" vm.sessions.unshift(session);\r\n vm.noSessions(fal" +
|
||||
"se);\r\n }\r\n if (session) {\r\n swi" +
|
||||
"tch (log.EventTypeId) {\r\n case 10: // SessionStarting\r\n " +
|
||||
" session.startTime(log.FormattedTimestamp.substring(log" +
|
||||
".FormattedTimestamp.indexOf(\' \') + 1));\r\n break;\r\n " +
|
||||
" case 11: // SessionProgress\r\n se" +
|
||||
"ssion.progressValue(log.Arguments[1]);\r\n session.prog" +
|
||||
"ressStatus(log.Arguments[2]);\r\n break;\r\n " +
|
||||
" case 12: // SessionFinished\r\n session.sess" +
|
||||
"ionEnded(true);\r\n session.progressStatus(\'Import Fini" +
|
||||
"shed\');\r\n break;\r\n case 15: //" +
|
||||
" SessionWarning\r\n session.messages.unshift(log);\r\n " +
|
||||
" break;\r\n case 16: // SessionErro" +
|
||||
"r\r\n session.messages.unshift(log);\r\n " +
|
||||
" break;\r\n case 100: // ImportPageStarting\r\n " +
|
||||
" session.addSessionPage(new sessionPageViewModel(sessionI" +
|
||||
"d, log.Arguments[1]));\r\n break;\r\n " +
|
||||
" case 104: // ImportPageImageUpdate\r\n var p = sess" +
|
||||
"ion.sessionPagesIndex[log.Arguments[1]];\r\n if (p) {\r\n" +
|
||||
" p.updateThumbnail();\r\n " +
|
||||
" }\r\n break;\r\n case 105: // Im" +
|
||||
"portPageProgress\r\n var p = session.sessionPagesIndex[" +
|
||||
"log.Arguments[1]];\r\n if (p) {\r\n " +
|
||||
" p.progressValue(log.Arguments[2]);\r\n p." +
|
||||
"progressStatus(log.Arguments[3]);\r\n }\r\n " +
|
||||
" break;\r\n case 110: // ImportPageDetected\r\n " +
|
||||
" var p = session.sessionPagesIndex[log.Arguments[1]];\r" +
|
||||
"\n if (p) {\r\n p.documen" +
|
||||
"tTemplateId(log.Arguments[2]);\r\n p.documentTempla" +
|
||||
"te(log.Arguments[3]);\r\n p.assignedDataType(log.Ar" +
|
||||
"guments[4]);\r\n p.assignedDataId(log.Arguments[5])" +
|
||||
";\r\n p.assignedData(log.Arguments[6]);\r\n " +
|
||||
" p.detected(true);\r\n if (!is" +
|
||||
"Live) {\r\n p.updateThumbnail();\r\n " +
|
||||
" }\r\n }\r\n " +
|
||||
" session.messages.unshift(log);\r\n break;\r\n " +
|
||||
" case 115: // ImportPageUndetected\r\n var " +
|
||||
"p = session.sessionPagesIndex[log.Arguments[1]];\r\n if" +
|
||||
" (p) {\r\n p.undetected(true);\r\n " +
|
||||
" if (!isLive) {\r\n p.updateThumbna" +
|
||||
"il();\r\n }\r\n }\r\n " +
|
||||
" session.messages.unshift(log);\r\n " +
|
||||
" break;\r\n case 150: // Ignore: ImportPageUndetectedStored" +
|
||||
"\r\n break;\r\n default:\r\n " +
|
||||
" session.messages.unshift(log);\r\n }\r\n " +
|
||||
" }\r\n }\r\n }\r\n function init() {\r\n /" +
|
||||
"/ Create View Model\r\n vm = new pageViewModel();\r\n\r\n // Loa" +
|
||||
"d Logs\r\n var d = new Date();\r\n var loadData = {\r\n " +
|
||||
" Format: \"json\",\r\n Start: d.getFullYear() + \'-\' + (d.getMon" +
|
||||
"th() + 1) + \'-\' + d.getDate(),\r\n End: null,\r\n Modu" +
|
||||
"leId: 40,\r\n Take: 2000\r\n };\r\n $.ajax({\r\n " +
|
||||
" url: \'");
|
||||
|
||||
|
||||
#line 283 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
|
||||
#line 288 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
|
||||
Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
|
||||
|
||||
|
||||
@@ -453,7 +457,7 @@ WriteLiteral(@"',
|
||||
liveConnection = $.connection('");
|
||||
|
||||
|
||||
#line 303 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
|
||||
#line 308 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
|
||||
Write(Url.Content("~/API/Logging/Notifications"));
|
||||
|
||||
|
||||
@@ -462,7 +466,7 @@ WriteLiteral(@"',
|
||||
WriteLiteral("\', { addToGroups: \'");
|
||||
|
||||
|
||||
#line 303 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
|
||||
#line 308 "..\..\Areas\Config\Views\DocumentTemplate\ImportStatus.cshtml"
|
||||
Write(Disco.BI.DocumentTemplateBI.Importer.DocumentImporterLog.Current.LiveLogGroupName);
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user