Skip to content

Commit 1be80f3

Browse files
Class creation/deletion fixes
1 parent e973713 commit 1be80f3

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "cache-visual-editor",
33
"printableName": "Cache Visual Editor",
4-
"version": "0.4.11",
4+
"version": "0.4.12",
55
"description": "Visual class editor for InterSystems Caché",
66
"main": "index.js",
77
"keywords": [

source/cache/VisualEditor.REST.Editor.cls

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ ClassMethod Save() As %Status
3030
set response.modified = 0
3131

3232
#define nextClass set className = $order(classes(className)) continue
33+
#define logError(%e) if (%e '= "") { set response.error = response.error _ %e _ $Char(10) }
3334

3435
set className = $order(classes(""))
3536
while (className '= "") {
@@ -43,15 +44,16 @@ ClassMethod Save() As %Status
4344
set classDef = ##class(%Dictionary.ClassDefinition).%OpenId(className)
4445
}
4546
if (classDef = "") {
46-
set response.error = response.error _ "Class " _ className _ " does not exists." _ $Char(10)
47+
$$$logError("Class " _ className _ " does not exists.")
4748
$$$nextClass
4849
}
4950

5051
if ($data(classData.%data("$delete"))) {
51-
set error = $System.Status.GetErrorText(classDef.%Delete(classDef.%Oid()))
52-
if (error '= "") { set response.error = response.error _ error _ $CHAR(10) }
52+
$$$logError($System.Status.GetErrorText(classDef.%Delete(classDef.%Oid())))
5353
set response.modified = response.modified + 1
5454
$$$nextClass
55+
} else {
56+
$$$logError($System.Status.GetErrorText(classDef.%Save()))
5557
}
5658

5759
set errorLog = ""
@@ -106,14 +108,14 @@ ClassMethod Save() As %Status
106108
}
107109

108110
if (errorLog '= "") {
109-
set response.error = response.error _ errorLog
111+
$$$logError(errorLog)
110112
$$$nextClass
111113
}
112114

113115
set st = $system.OBJ.Compile(className, "cuk-d", .errorLog)
114116

115117
if (errorLog '= 0) {
116-
set response.error = response.error _ errorLog(1) _ $CHAR(10)
118+
$$$logError(errorLog(1))
117119
$$$nextClass
118120
}
119121

source/client/js/classEditor/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ let backButton = onInit(() => {
9191
setup["fullName"] = fullName;
9292
}
9393
grid.applyChild(getCardElement(setup));
94-
addChange([fullName, "$add"], true);
94+
if (type !== "package")
95+
addChange([fullName, "$add"], true);
9596
});
9697
});
9798

0 commit comments

Comments
 (0)