From e3eb4ecf7e19d90a6a14e9301bc012288d30d4e4 Mon Sep 17 00:00:00 2001 From: NonakaKazuhiro Date: Mon, 16 Jun 2025 15:11:31 +0900 Subject: [PATCH] =?UTF-8?q?GEM:=E8=A9=B3=E7=B4=B0=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=8B=E3=82=89=E3=83=AA=E3=83=95=E3=82=A1=E3=83=AC=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E7=B7=A8=E9=9B=86=E6=99=82=E3=81=AECallback=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E3=82=92=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=9E=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../META-INF/resources/scripts/gem/common.js | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/iplass-gem/src/main/resources/META-INF/resources/scripts/gem/common.js b/iplass-gem/src/main/resources/META-INF/resources/scripts/gem/common.js index 856210974b..38fa803ed3 100644 --- a/iplass-gem/src/main/resources/META-INF/resources/scripts/gem/common.js +++ b/iplass-gem/src/main/resources/META-INF/resources/scripts/gem/common.js @@ -3327,26 +3327,32 @@ function viewEditableReference(viewAction, defName, oid, reloadUrl, refEdit, url document.scriptContext["editReferenceCallback"] = function(entity) { edited = true; - if ($("body.modal-body").length != 0) { - //FIXME このパターンはどれか不明?参照ダイアログでNestTableを利用している場合か? - - //refEdit,modalTarget→ダイアログ表示時のパラメータを再利用 - submitForm(reloadUrl, { - "defName":$(":hidden[name='defName']").val(), - "oid":$(":hidden[name='oid']").val(), - "refEdit":editable, - "modalTarget":modalTarget - }); - closeModalDialog(); - + + var func = document.scriptContext["customEditReferenceCallback"]; + if (func && $.isFunction(func)) { + func.call(this, entity); } else { - var $form = $("
").attr({method:"POST", action:viewAction + "/" + encodeURIComponent(oid), target:target}).appendTo("body"); - $("").attr({type:"hidden", name:"version", value:entity.version}).appendTo($form); - $("").attr({type:"hidden", name:"refEdit", value:refEdit}).appendTo($form); - if (isSubModal) $("").attr({type:"hidden", name:"modalTarget", value:target}).appendTo($form); + if ($("body.modal-body").length != 0) { + //FIXME このパターンはどれか不明?参照ダイアログでNestTableを利用している場合か? + + //refEdit,modalTarget→ダイアログ表示時のパラメータを再利用 + submitForm(reloadUrl, { + "defName":$(":hidden[name='defName']").val(), + "oid":$(":hidden[name='oid']").val(), + "refEdit":editable, + "modalTarget":modalTarget + }); + closeModalDialog(); - $form.submit(); - $form.remove(); + } else { + var $form = $("").attr({method:"POST", action:viewAction + "/" + encodeURIComponent(oid), target:target}).appendTo("body"); + $("").attr({type:"hidden", name:"version", value:entity.version}).appendTo($form); + $("").attr({type:"hidden", name:"refEdit", value:refEdit}).appendTo($form); + if (isSubModal) $("").attr({type:"hidden", name:"modalTarget", value:target}).appendTo($form); + + $form.submit(); + $form.remove(); + } } };