fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/3.0.1-GA (pull request #2631)

Browse Source 
PM-3250
This commit is contained in:
Julio Cesar Laura Avendaño
2015-08-19 09:18:41 -04:00
parent a763a81d7a 1690ee9e4c
commit 9f255d6be3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.inputfilter.php
View File

@@ -431,7 +431,7 @@ class InputFilter
if(!is_object(G::json_decode($val))) { if(!is_object(G::json_decode($val))) {
$inputFiltered = $purifier->purify($val); $inputFiltered = $purifier->purify($val);
if($type != "url" && !strpos(basename($val), "=")) { if($type != "url" && !strpos(basename($val), "=")) {
$inputFiltered = addslashes(htmlspecialchars($inputFiltered, ENT_COMPAT, 'UTF-8')); $inputFiltered = htmlspecialchars($inputFiltered, ENT_NOQUOTES, 'UTF-8');
} else { } else {
$inputFiltered = str_replace('&','&',$inputFiltered); $inputFiltered = str_replace('&','&',$inputFiltered);
} }

4
workflow/engine/classes/class.pmDynaform.php
View File

@@ -16,7 +16,7 @@ class pmDynaform
public $credentials = null; public $credentials = null;
public $lang = null; public $lang = null;
public $langs = null; public $langs = null;
public $onPropertyRead = ""; public $onPropertyRead = "onPropertyReadFormInstance";
public function __construct($fields = array()) public function __construct($fields = array())
{ {
@@ -272,7 +272,7 @@ class pmDynaform
} }
//todo compatibility 'columnWidth' //todo compatibility 'columnWidth'
foreach ($json->columns as $column) { foreach ($json->columns as $column) {
if (!isset($column->columnWidth)) { if (!isset($column->columnWidth) && $column->type !== "hidden") {
$json->layout = "static"; $json->layout = "static";
$column->columnWidth = ""; $column->columnWidth = "";
} }

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

@@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html style="height:97%"> <html>
<head> <head>
<title>PMDynaform</title> <title>PMDynaform</title>
<meta charset="utf-8"> <meta charset="utf-8">
@@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css"> <link rel="stylesheet" href="/lib/pmdynaform/libs/bootstrap-3.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.css"> <link rel="stylesheet" href="/lib/pmdynaform/libs/datepicker/bootstrap-datetimepicker.css">
<link rel="stylesheet" href="/lib/pmdynaform/build/css/PMDynaform.css"> <link rel="stylesheet" href="/lib/pmdynaform/build/css/PMDynaform.css">
<script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/jquery/jquery-1.11.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>
<script type="text/javascript" src="/lib/pmdynaform/libs/underscore/underscore-1.6.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/underscore/underscore-1.6.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/backbone/backbone-min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/backbone/backbone-min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/restclient/restclient.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/restclient/restclient.js"></script>
@@ -19,7 +19,7 @@
<script type="text/javascript" src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
</head> </head>
<body style="height:100%"> <body style="height:100%">
<div id="container" style="height:100% display:none"></div> <div id="container" style="height:100%;display:none;"></div>
###TEMPLATES### ###TEMPLATES###
<script type="text/javascript" src="/lib/pmdynaform/libs/underscore/underscore-1.6.js"></script> <script type="text/javascript" src="/lib/pmdynaform/libs/underscore/underscore-1.6.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script> <script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script>