fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'pm/master'

Browse Source
This commit is contained in:
Ronald Quenta
2015-07-03 17:07:03 -04:00
parent a3020705fc 6d1d32bc22
commit 3272f07a99
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/classes/class.cli.php
View File

@@ -149,6 +149,25 @@ class CLI
} }
$tasks = join( "\n", $tasks ); $tasks = join( "\n", $tasks );
echo $tasks . "\n\n"; echo $tasks . "\n\n";
} else {
$options = array();
$tasks = array();
ksort( self::$tasks );
foreach (self::$tasks as $name => $data) {
$description = explode( "\n", $data['description'] );
$options[] = "$name";
}
if (!in_array($taskName, $options)) {
echo "\nThe task does not exist \n";
echo "Use one of the following tasks:\n";
$tasks = array ();
ksort( self::$tasks );
foreach (self::$tasks as $name => $data) {
$description = explode( "\n", $data['description'] );
$tasks[] = " $name";
}
$tasks = join( "\n", $tasks );
echo $tasks . "\n\n";
} else{ } else{
$valid_args = array (); $valid_args = array ();
foreach (self::$tasks[$taskName]['args'] as $arg => $data) { foreach (self::$tasks[$taskName]['args'] as $arg => $data) {
@@ -196,6 +215,7 @@ EOT;
echo $message . "\n"; echo $message . "\n";
} }
} }
}
/** /**
* Run the CLI task, which will check which command is specified and run it. * Run the CLI task, which will check which command is specified and run it.

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

@@ -1564,9 +1564,11 @@ class workspaceTools
$version = explode('-', $version); $version = explode('-', $version);
$versionPresent = ( isset($version[0])) ? $version[0] : ''; $versionPresent = ( isset($version[0])) ? $version[0] : '';
CLI::logging(CLI::warning(" CLI::logging(CLI::warning("
Note.- If you try to execute a restore from a generated backup on a recent version of Processmaker Warning: A workspace from a newer version of ProcessMaker can NOT be restored in an older version of
than version you are using currently to restore it, it may be occur errors on the restore process, ProcessMaker. For example, restoring from v.3.0 to v.2.5 will not work. However, it may be possible
it shouldn't be restaured generated backups on later versions than version when the restore is executed") . "\n"); to restore a workspace from an older version to an newer version of ProcessMaker, although error
messages may be displayed during the restore process. Make sure to run the \"processmaker cacheview-repair\"
and \"processmaker migrate-new-cases-lists\" commands after restoring a workspace.") . "\n");
foreach ($metaFiles as $metaFile) { foreach ($metaFiles as $metaFile) {
$metadata = G::json_decode(file_get_contents($metaFile)); $metadata = G::json_decode(file_get_contents($metaFile));