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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Victor Saisa Lopez
2014-07-01 09:10:51 -04:00
parent 7cb55323e3 26915cf8ec
commit b33b393bec
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@@ -2,7 +2,7 @@
<project name="ProcessMaker Michelangelo" default="build-phpcs"> <project name="ProcessMaker Michelangelo" default="build-phpcs">
<target name="build" <target name="build"
depends="prepare,lint,phploc,pdepend,phpcs-ci,phpunit,phpdox,behat"/> depends="prepare,lint,phploc,phpcs-ci,phpunit,phpdox,behat"/>
<target name="build-simple" <target name="build-simple"
depends="prepare,phpunit,phpcs-ci,phploc,lint"/> depends="prepare,phpunit,phpcs-ci,phploc,lint"/>

4
features/bootstrap/RestContext.php
View File

@@ -1629,7 +1629,7 @@ class RestContext extends BehatContext
*/ */
public function saveExportedProcessTo($destinationFolder, $exportedProcessFileName="") public function saveExportedProcessTo($destinationFolder, $exportedProcessFileName="")
{ {
if($exportedProcessFileName == ""){//Obtain name from XML if($exportedProcessFileName == ""){//Obtain name from XML
$exportedProcessFileName=$this->_data->xpath('//metadata/meta[@key="name"]'); $exportedProcessFileName=$this->_data->xpath('//metadata/meta[@key="name"]');
$exportedProcessFileName = $exportedProcessFileName[0]; $exportedProcessFileName = $exportedProcessFileName[0];
@@ -1643,7 +1643,7 @@ class RestContext extends BehatContext
$this->printDebug("Exporting process to: $exportedProcessFileName"); $this->printDebug("Exporting process to: $exportedProcessFileName");
file_put_contents($exportedProcessFileName, $this->_response->getBody(true)); file_put_contents($exportedProcessFileName, $this->_response->getBody(true));
chmod($exportedProcessFileName, 0777);
} }

2
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -551,7 +551,7 @@ class pmTablesProxy extends HttpProxyController
require_once $sPath . $this->className . '.php'; require_once $sPath . $this->className . '.php';
$rows = G::json_decode( stripslashes( $httpData->rows ) ); $rows = G::json_decode( $httpData->rows );
if (is_array( $rows )) { if (is_array( $rows )) {
foreach ($rows as $row) { foreach ($rows as $row) {

4
workflow/engine/skinEngine/neoclassic/css/style.css
View File

@@ -3458,3 +3458,7 @@ button.x-btn-text:focus,
/* Safari, Chrome */ /* Safari, Chrome */
} }
.logo_company {
padding-left: 10px;
}

2
workflow/engine/skinEngine/neoclassic/layout.html
View File

@@ -12,7 +12,7 @@
<table width="100%" height="32" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> <table width="100%" height="32" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
<tr> <tr>
{if $user_logged neq '' or $tracker neq ''} {if $user_logged neq '' or $tracker neq ''}
<td width="50%" rowspan="2" valign="center"><img src="{$logo_company}"/></td> <td width="50%" rowspan="2" valign="center"><img src="{$logo_company}" class="logo_company"/></td>
<td width="50%" height="16" align="right" valign="top"> <td width="50%" height="16" align="right" valign="top">
<div align="right" class="logout"> <div align="right" class="logout">
<small> <small>