fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in revert-pr-8422 (pull request #8423)

Browse Source 
Revert "PMCORE-3679 (pull request #8422)"
This commit is contained in:
Paula Quispe
2022-04-14 13:04:16 +00:00
parent 50d864ffce fb606d5611
commit e79f5ac1cc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/methods/errors/error403.php
View File

@@ -52,7 +52,7 @@ if (isset($_GET["url"]) && $_GET["url"] != "") {
<link href="../lib/pmdynaform/libs/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet"> <link href="../lib/pmdynaform/libs/font-awesome-4.6.3/css/font-awesome.min.css" rel="stylesheet">
<!-- Custom styling plus plugins --> <!-- Custom styling plus plugins -->
<link href="../lib/pmdynaform/libs/custom/custom.css" rel="stylesheet"> <link href="../lib/pmdynaform/libs/custom/custom.css" rel="stylesheet">
<script type="text/javascript" src="../lib/pmdynaform/libs/jquery/jquery-3.6.0.js"></script> <script type="text/javascript" src="../lib/pmdynaform/libs/jquery/jquery-1.11.js"></script>
<script type="text/javascript"> <script type="text/javascript">
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
var btnLogin = $("#login"), var btnLogin = $("#login"),

4
workflow/engine/classes/PmDynaform.php
View File

@@ -1224,7 +1224,7 @@ class PmDynaform
var pathRTLCss = \"" . $this->pathRTLCss . "\"; var pathRTLCss = \"" . $this->pathRTLCss . "\";
var delIndex = " . (isset($this->fields["DEL_INDEX"]) ? $this->fields["DEL_INDEX"] : "0") . "; var delIndex = " . (isset($this->fields["DEL_INDEX"]) ? $this->fields["DEL_INDEX"] : "0") . ";
" . $this->getTheStringVariableForGoogleMaps() . "\n " . $this->getTheStringVariableForGoogleMaps() . "\n
$(window).on('load',(function () $(window).load(function ()
{ {
var data = jsondata; var data = jsondata;
@@ -1288,7 +1288,7 @@ class PmDynaform
"var delIndex = " . (isset($this->fields["DEL_INDEX"]) ? $this->fields["DEL_INDEX"] : "0") . ";\n" . "var delIndex = " . (isset($this->fields["DEL_INDEX"]) ? $this->fields["DEL_INDEX"] : "0") . ";\n" .
"var leaveCaseWarning = " . $this->getLeaveCaseWarning() . ";\n" . "var leaveCaseWarning = " . $this->getLeaveCaseWarning() . ";\n" .
$this->getTheStringVariableForGoogleMaps() . "\n" . $this->getTheStringVariableForGoogleMaps() . "\n" .
"$(window).on('load',(function () {\n" . "$(window).load(function () {\n" .
" var data = jsondata;\n" . " var data = jsondata;\n" .
" window.dynaform = new PMDynaform.core.Project({\n" . " window.dynaform = new PMDynaform.core.Project({\n" .
" data: data,\n" . " data: data,\n" .

2
workflow/engine/js/cases/core/pmDynaform.js
View File

@@ -16,7 +16,7 @@ function submitNextStep(formStep) {
$("#" + formStep.id).submitForm(); $("#" + formStep.id).submitForm();
return this; return this;
} }
$(window).on("load", function () { $(window).load(function () {
var delIndexDefault = "0", var delIndexDefault = "0",
dyn_uid = window.dyn_uid || null; dyn_uid = window.dyn_uid || null;
if (pm_run_outside_main_app === 'true') { if (pm_run_outside_main_app === 'true') {

2
workflow/engine/templates/cases/pmdynaform.html
View File

@@ -17,7 +17,7 @@
<script type="text/javascript" src="/translations/translationsMafe.js"></script> <script type="text/javascript" src="/translations/translationsMafe.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/moment/moment.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/moment/moment.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-3.6.0.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/select2/select2.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/select2/select2.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-3.1.1/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.js"></script>