Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 10c0612

Browse files
author
Steven C. Buttgereit
committed
Merge branch 'hotfix/MUSESUPERCHAR_2.2.1'
2 parents 6f9e552 + c811b71 commit 10c0612

File tree

5 files changed

+45
-8
lines changed

5 files changed

+45
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# Muse Systems Super Characteristics for xTuple ERP v2.2.0
1+
# Muse Systems Super Characteristics for xTuple ERP v2.2.1

client/scripts/forms/xtuple/purchaseOrder.js

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ try {
3636
MuseUtils.MOD_EXCEPTION,
3737
MuseUtils.MOD_JSPOLYFILL,
3838
MuseUtils.MOD_JS,
39-
MuseUtils.MOD_CONFIG
39+
MuseUtils.MOD_CONFIG,
40+
MuseUtils.MOD_QT
4041
]);
4142

4243
if (typeof MuseSuperChar.Loader === "undefined") {
@@ -81,7 +82,7 @@ try {
8182

8283
// Mutable state
8384
var scWidget = null;
84-
85+
var isFormAlreadyStarted = false;
8586
//--------------------------------------------------------------------
8687
// Get Object References From Screen Definitions
8788
//--------------------------------------------------------------------
@@ -150,12 +151,37 @@ try {
150151
//----------------------------------------------------------------
151152
// Connects/Disconnects
152153
//----------------------------------------------------------------
153-
mywindow["saved(int)"].connect(mySave);
154+
if (!isFormAlreadyStarted) {
155+
mywindow["saved(int)"].connect(mySave);
156+
}
154157
};
155158

156159
//--------------------------------------------------------------------
157160
// Public Interface -- Slots
158161
//--------------------------------------------------------------------
162+
pPublicApi.sModeUpdate = function(pNewModeEnum) {
163+
var resolvedMode = MuseUtils.getModeFromXtpEnumId(pNewModeEnum);
164+
var resolvedId = mywindow.id();
165+
166+
if (
167+
["new", "edit", "view"].includes(resolvedMode) &&
168+
MuseUtils.isValidId(resolvedId)
169+
) {
170+
initSuperChar(resolvedMode, resolvedId);
171+
}
172+
};
173+
174+
pPublicApi.sNewId = function(pNewId) {
175+
var resolvedMode = MuseUtils.getModeFromXtpEnumId(mywindow.mode());
176+
var resolvedId = pNewId;
177+
178+
if (
179+
["new", "edit", "view"].includes(resolvedMode) &&
180+
MuseUtils.isValidId(resolvedId)
181+
) {
182+
initSuperChar(resolvedMode, resolvedId);
183+
}
184+
};
159185

160186
//--------------------------------------------------------------------
161187
// Public Interface -- Functions
@@ -170,9 +196,20 @@ try {
170196

171197
if (["new", "edit", "view"].includes(myMode) && scWidget !== null) {
172198
initSuperChar(myMode, mywindow.id());
199+
} else if (myMode == "releasePr") {
200+
initSuperChar(
201+
MuseUtils.getModeFromXtpEnumId(mywindow.mode()),
202+
mywindow.id() == -1 ? null : mywindow.id()
203+
);
173204
} else {
174205
return;
175206
}
207+
208+
if (!isFormAlreadyStarted) {
209+
mywindow["newMode(int)"].connect(pPublicApi.sModeUpdate);
210+
mywindow["newId(int)"].connect(pPublicApi.sNewId);
211+
isFormAlreadyStarted = true;
212+
}
176213
};
177214

178215
//--------------------------------------------------------------------

database/functions/get_qt_data_js_template.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CREATE OR REPLACE FUNCTION musesuperchar.get_qt_data_js_template()
2424
$JS$
2525
// File: %7$s%5$s
2626
// Project: Muse Systems Super Characteristics for xTuple ERP
27-
// Version: 2.2.0
27+
// Version: 2.2.1
2828
// Created: %4$s Script Automatically Generated On %8$s
2929
//
3030
// Licensed to Lima Buttgereit Holdings LLC (d/b/a Muse Systems) under one or

database/functions/get_qt_form_js_template.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CREATE OR REPLACE FUNCTION musesuperchar.get_qt_form_js_template()
2525
$JS$
2626
// File: %8$s%2$s
2727
// Project: Muse Systems Super Characteristics for xTuple ERP
28-
// Version: 2.2.0
28+
// Version: 2.2.1
2929
// Created: %9$s Script Automatically Generated On %10$s
3030
//
3131
// Licensed to Lima Buttgereit Holdings LLC (d/b/a Muse Systems) under one or

package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name="musesuperchar"
33
developer="Muse Systems"
44
descrip="A package to provide an enhanced, more broadly functional user defined field functionality."
5-
version="2.2.0"
5+
version="2.2.1"
66
updater="2.5.2">
77

88
<pkgnotes>
@@ -12,7 +12,7 @@
1212
<message>
1313
&lt;p>
1414
Muse Systems Super Characteristics for xTuple ERP (musesuperchar) &lt;br/>
15-
Version 2.2.0
15+
Version 2.2.1
1616
&lt;/p>
1717
&lt;p>
1818
Copyright (C) 2017-2020 &lt;br/>

0 commit comments

Comments
 (0)