fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-11421

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2013-05-02 17:22:54 +00:00
parent aa24048622 eafbd3d32f
commit d43797ea9e
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gulliver/system/class.bootstrap.php
View File

@@ -580,9 +580,15 @@ class Bootstrap
if (strtolower($typefile) == 'js' && $typearray[0] == 'translation') {
Bootstrap::sendHeaders($filename, 'text/javascript', $download, $downloadFileName);
$filename = str_replace(implode(".", $typearray), $typearray[0] . "." . $typearray[1] . "." . $typearray[count($typearray) - 1], $filename);
if ($typearray[1] != "enterprise") {
$arrayAux = array($typearray[0], $typearray[1], $typearray[count($typearray) - 1]);
$output = Bootstrap::streamJSTranslationFile($filename, $typearray[1]);
$filename = str_replace(implode(".", $typearray), implode(".", $arrayAux), $filename);
$typearray = $arrayAux;
}
$output = Bootstrap::streamJSTranslationFile($filename, $typearray[count($typearray) - 2]);
echo $output;

14
gulliver/thirdparty/pear/Archive/Tar.php vendored
View File

@@ -917,6 +917,12 @@ class Archive_Tar extends PEAR
if ($v_filename == '')
continue;
if($v_filename == $p_remove_dir.'/plugin.singleton')
continue;
if($v_filename == $p_remove_dir.'/ee')
continue;
// ----- ignore files and directories matching the ignore regular expression
if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/'.$v_filename)) {
$this->_warning("File '$v_filename' ignored");
@@ -1090,12 +1096,12 @@ class Archive_Tar extends PEAR
$v_magic = 'ustar ';
$v_version = ' ';
if (function_exists('posix_getpwuid'))
{
$userinfo = posix_getpwuid($v_info[4]);
$groupinfo = posix_getgrgid($v_info[5]);
$v_uname = $userinfo['name'];
$v_gname = $groupinfo['name'];
}
@@ -1179,7 +1185,7 @@ class Archive_Tar extends PEAR
{
$userinfo = posix_getpwuid($p_uid);
$groupinfo = posix_getgrgid($p_gid);
$v_uname = $userinfo['name'];
$v_gname = $groupinfo['name'];
}
@@ -1188,7 +1194,7 @@ class Archive_Tar extends PEAR
$v_uname = '';
$v_gname = '';
}
$v_devmajor = '';
$v_devminor = '';

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

@@ -272,7 +272,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) {
$arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] );
if (!(self::verifyPluginDashlet($row['DAS_CLASS']))) {
if (self::verifyPluginDashlet($row["DAS_CLASS"])) {
$row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] );
$row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
$row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null);
@@ -303,7 +303,7 @@ class PMDashlet extends DashletInstance implements DashletInterface
if (! isset( $dashletsInstances[$row['DAS_INS_UID']] )) {
$arrayField = unserialize( $row["DAS_INS_ADDITIONAL_PROPERTIES"] );
if (!(self::verifyPluginDashlet($row['DAS_CLASS']))) {
if (self::verifyPluginDashlet($row["DAS_CLASS"])) {
$row['DAS_XTEMPLATE'] = $this->getXTemplate( $row['DAS_CLASS'] );
$row["DAS_TITLE"] = (isset( $arrayField["DAS_INS_TITLE"] ) && ! empty( $arrayField["DAS_INS_TITLE"] )) ? $arrayField["DAS_INS_TITLE"] : $row["DAS_TITLE"];
$row["DAS_TITLE"] = $row["DAS_TITLE"] . ((isset( $arrayField["DAS_INS_SUBTITLE"] ) && ! empty( $arrayField["DAS_INS_SUBTITLE"] )) ? str_replace( "@@USR_USERNAME", $_SESSION["USR_USERNAME"], $arrayField["DAS_INS_SUBTITLE"] ) : null);

6
workflow/engine/classes/class.wsTools.php
View File

@@ -1099,6 +1099,12 @@ class workspaceTools
foreach ($metadata->directories as $dir) {
CLI::logging("+> Restoring directory '$dir'\n");
if(file_exists("$tempDirectory/$dir" . "/ee")) {
G::rm_dir("$tempDirectory/$dir" . "/ee");
}
if(file_exists("$tempDirectory/$dir" . "/plugin.singleton")) {
G::rm_dir("$tempDirectory/$dir" . "/plugin.singleton");
}
if (!rename("$tempDirectory/$dir", $workspace->path)) {
throw new Exception("There was an error copying the backup files ($tempDirectory/$dir) to the workspace directory {$workspace->path}.");
}

15
workflow/engine/templates/processes/main.js
View File

@@ -263,16 +263,7 @@ Ext.onReady(function(){
importProcessGlobal.processFileType = "pm";
importProcess();
}
},
!PARTNER_FLAG ?
[{
text: _('ID_BROWSE_LIBRARY'),
iconCls: 'button_menu_ext ss_sprite ss_world',
//icon: '/images/icon-pmwebservices.png',
handler: browseLibrary
}
] : [],
{
},{
xtype: 'tbfill'
},{
xtype: 'tbseparator'
@@ -1095,10 +1086,6 @@ importProcess = function()
w.show();
}
browseLibrary = function(){
window.location = 'processes_Library';
}
function activeDeactive(){
var rows = processesGrid.getSelectionModel().getSelections();