Skip to content

Commit 5673d9c

Browse files
authored
Merge branch 'master' into master
2 parents d9d6393 + 929634b commit 5673d9c

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

MDX2JSON/Utils.cls

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ ClassMethod GetDataSource(pDataSource As %String)
291291
set st = $$$OK
292292
try {
293293

294-
if ($FIND(pDataSource, ".pivot") = ($LENGTH(pDataSource) + 1)) {
294+
if ($FIND(pDataSource, ".pivot") = ($LENGTH(pDataSource) + 1) && pDataSource '="") {
295295
set st = ..OpenPivotByName(pDataSource, .dataSource)
296296
return:($$$ISERR(st)) st
297297

@@ -578,11 +578,13 @@ ClassMethod AddWidget(sWidget As %String, sDashboard As %String, key As %String)
578578
// Edit exists widget
579579
for i=1:1:tDash.widgets.Count()
580580
{
581+
581582
set dWidgets = tDash.widgets.GetAt(i)
582583

583584
// Check if we trying to change widget name with exists one
584585
if ((dWidgets.name '= key) && (dWidgets.name = sWidget.name)) {
585586
return $$$ERROR($$$GeneralError,"Widget " _ sWidget.name _ " already exists")
587+
586588
}
587589

588590
if (dWidgets.name = key)

module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Export generator="Cache" version="25">
33
<Document name="MDX2JSON.ZPM"><Module>
44
<Name>MDX2JSON</Name>
5-
<Version>3.2.26</Version>
5+
<Version>3.2.29</Version>
66
<Description>RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects.</Description>
77
<Packaging>module</Packaging>
88
<SourcesRoot>./</SourcesRoot>

0 commit comments

Comments
 (0)