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

workflow/engine/classes/class.wsTools.php

@@ -1552,6 +1552,13 @@ class workspaceTools
             foreach ($metadata->databases as $db) {
                 if ($dbName != $newDBNames[$db->name]) {
                     $dbName = $newDBNames[$db->name];
+                    
+                    if (mysql_select_db($dbName, $link)) {
+                        if(!$overwrite) {
+                            throw new Exception("Destination Database already exist (use -o to overwrite)");
+                        }
+                    }
+
                     CLI::logging("+> Restoring database {$db->name} to $dbName\n");
                     $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql",$aParameters);
                     $workspace->createDBUser($dbName, $db->pass, "localhost", $dbName);

workflow/engine/templates/enterprise/addonsStore.js

@@ -1415,8 +1415,6 @@ Ext.onReady(function() {
                 renderer: function (val, metadata, record, rowIndex, colIndex, store) {
                     if (record.get('release_type') == 'beta') {
                       return val + " <span style='color:red'> (Beta)</span>";
-                    } else if (record.get('release_type') == 'localRegistry') {
-                      return val + " <span style='color:gray'> (Local)</span>";
                     } else {
                       return val;
                     }