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

HOR-844

Browse Source 
HOR-844
This commit is contained in:
Paula V. Quispe
2016-04-25 10:59:21 -04:00
parent 4cc8a1e92a
commit 7ec7ce36ea
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gulliver/system/class.g.php
View File

@@ -526,13 +526,13 @@ class G
$oHeadPublisher->clearScripts(); $oHeadPublisher->clearScripts();
$oHeadPublisher->leimnudInitString = $leimnudInitString; $oHeadPublisher->leimnudInitString = $leimnudInitString;
$oHeadPublisher->addScriptFile( '/js/maborak/core/maborak.js' ); $oHeadPublisher->addScriptFile( '/js/maborak/core/maborak.js' );
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', null, array ('MESSAGE' => $e->getMessage() $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', null, array ('MESSAGE' => self::getErrorMessage($e)
) ); ) );
if (class_exists( 'SkinEngine' )) { if (class_exists( 'SkinEngine' )) {
$skinEngine = new SkinEngine( 'publish', 'blank', '' ); $skinEngine = new SkinEngine( 'publish', 'blank', '' );
$skinEngine->dispatch(); $skinEngine->dispatch();
} else { } else {
die( $e->getMessage() ); die( self::getErrorMessage($e) );
} }
} }
} }
@@ -5657,6 +5657,18 @@ class G
{ {
return crc32($string); return crc32($string);
} }
/**
* this function get the Message
* @access public
* @param string $e
* @return string
*
*/
public static function getErrorMessage($e)
{
return $e->getMessage();
}
} }
/** /**

2
workflow/engine/bin/tasks/cliAddons.php
View File

@@ -133,7 +133,7 @@ function change_hash($command, $opts)
$workspace->close(); $workspace->close();
CLI::logging(pakeColor::colorize("Changed...", "ERROR") . "\n"); CLI::logging(pakeColor::colorize("Changed...", "ERROR") . "\n");
} catch (Exception $e) { } catch (Exception $e) {
echo "> Error: ".CLI::error($e->getMessage()) . "\n"; echo "> Error: ".CLI::error(G::getErrorMessage($e)) . "\n";
} }
} }
} }

2
workflow/engine/bin/tasks/cliMafe.php
View File

@@ -62,7 +62,7 @@ function run_create_translation($args, $opts)
echo "Updating labels for workspace " . pakeColor::colorize($workspace->name, "INFO") . "\n"; echo "Updating labels for workspace " . pakeColor::colorize($workspace->name, "INFO") . "\n";
$translation->generateTransaltionMafe($lang); $translation->generateTransaltionMafe($lang);
} catch (Exception $e) { } catch (Exception $e) {
echo "Errors upgrading labels for workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n"; echo "Errors upgrading labels for workspace " . CLI::info($workspace->name) . ": " . CLI::error(G::getErrorMessage($e)) . "\n";
} }
} }

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

@@ -13,7 +13,7 @@ class labelsGmail
$labels = array_merge($labels, $labelsResponse->getLabels()); $labels = array_merge($labels, $labelsResponse->getLabels());
} }
} catch (Exception $e) { } catch (Exception $e) {
print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage(); print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . G::getErrorMessage($e);
throw ($e); throw ($e);
} }
return $labels; return $labels;
@@ -37,7 +37,7 @@ class labelsGmail
try { try {
$message = $service->users_messages->modify($userId, $messageId, $mods); $message = $service->users_messages->modify($userId, $messageId, $mods);
} catch (Exception $e) { } catch (Exception $e) {
print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage(); print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . G::getErrorMessage($e);
throw ($e); throw ($e);
} }
} }
@@ -69,7 +69,7 @@ class labelsGmail
$messages = array_merge($messages, $messagesResponse->getMessages()); $messages = array_merge($messages, $messagesResponse->getMessages());
} }
} catch (Exception $e) { } catch (Exception $e) {
print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage(); print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . G::getErrorMessage($e);
throw ($e); throw ($e);
} }
} while ($pageToken); } while ($pageToken);