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

Merged in release/3.2 (pull request #5488)

Browse Source 
Release/3.2

Approved-by: Paula Quispe
This commit is contained in:
Paula Quispe
2017-03-06 14:55:50 +00:00
parent 381bf03d1f bf403d7a41
commit 153eb52170
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmDashlet.php
View File

@@ -324,7 +324,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
}
}
foreach ($dashletsInstances as $key => $field) {
$dashletsInstances[$key]['DAS_TITLE'] = $field['DAS_TITLE'] . '</span><span style="float:right; font: bold;" id="'. $field['DAS_INS_UID'] .'">';
$dashletsInstances[$key]['DAS_TITLE'] = htmlentities($field['DAS_TITLE'], ENT_QUOTES, 'UTF-8') . '</span><span style="float:right; font: bold;" id="'. $field['DAS_INS_UID'] .'">';
}
// Check for role assigments
// ToDo: Next release

2
workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
View File

@@ -769,7 +769,7 @@ class FilesManager
if (is_file($f)) {
$arrayProcessFilesData = $this->getFileManagerUid($f);
if (is_null($arrayProcessFilesData["PRF_UID"])) {
if (empty($arrayProcessFilesData["PRF_UID"])) {
rename($dir . PATH_SEP . $file, $dir . PATH_SEP . $file . ".tmp");
$arrayData = array(

8
workflow/engine/templates/dashboard/dashletsList.js
View File

@@ -185,10 +185,10 @@ Ext.onReady(function(){
}
});
function formatLineWrap(value){
str = '<div class="title-dashboard-text">'+value+'</div>';
return str;
}
function formatLineWrap(value) {
var str = '<div class="title-dashboard-text">' + Ext.util.Format.htmlEncode(value) + '</div>';
return str;
}
cmodel = new Ext.grid.ColumnModel({
defaults: {