Compare commits

..

7 Commits
3.2.1 ... 3.2.2

Author SHA1 Message Date
yuri
6f45e26028 version 2015-04-24 10:04:19 +03:00
Taras Machyshyn
f6892877c1 Extension can be installed with the same version 2015-04-23 15:44:31 +03:00
yuri
c7cc44edf6 Merge branch 'hotfix/3.2.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/3.2.2 2015-04-23 11:56:41 +03:00
yuri
e958d7c488 fix inbound email 2015-04-23 11:55:25 +03:00
Taras Machyshyn
77ff11990b Installer: disable prompt password saving while installing 2015-04-23 11:48:23 +03:00
Taras Machyshyn
994e0c1eda Extensions: improved restore functionality of install script 2015-04-23 10:48:42 +03:00
Taras Machyshyn
d51e88be60 Minor bug fixes for fileManager 2015-04-23 10:42:24 +03:00
7 changed files with 6 additions and 20 deletions

View File

@@ -27,13 +27,6 @@ use Espo\Core\Utils\Util;
class Install extends \Espo\Core\Upgrades\Actions\Base
{
/**
* Is copied extension files to Espo
*
* @var [type]
*/
protected $isCopied = null;
/**
* Main installation process
*
@@ -54,8 +47,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
$this->initialize();
$this->isCopied = false;
/** check if an archive is unzipped, if no then unzip */
$packagePath = $this->getPackagePath();
if (!file_exists($packagePath)) {
@@ -77,7 +68,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
if (!$this->copyFiles()) {
$this->throwErrorAndRemovePackage('Cannot copy files.');
}
$this->isCopied = true;
/* remove files defined in a manifest */
$this->deleteFiles(true);
@@ -103,10 +93,6 @@ class Install extends \Espo\Core\Upgrades\Actions\Base
protected function restoreFiles()
{
if (!$this->isCopied) {
return;
}
$GLOBALS['log']->info('Installer: Restore previous files.');
$backupPath = $this->getPath('backupPath');

View File

@@ -160,7 +160,7 @@ class Install extends \Espo\Core\Upgrades\Actions\Base\Install
$extensionEntity = $this->getExtensionEntity();
if (isset($extensionEntity)) {
$comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'));
$comparedVersion = version_compare($manifest['version'], $extensionEntity->get('version'), '>=');
if ($comparedVersion <= 0) {
$this->throwErrorAndRemovePackage('You cannot install an older version of this extension.');
}

View File

@@ -472,7 +472,7 @@ class Manager
$sourceFile = is_file($sourcePath) ? $sourcePath : $this->concatPaths(array($sourcePath, $file));
$destFile = $this->concatPaths(array($destPath, $file));
if (file_exists($sourceFile)) {
if (file_exists($sourceFile) && is_file($sourceFile)) {
$res &= copy($sourceFile, $destFile);
}
}

View File

@@ -406,7 +406,7 @@ class InboundEmail extends \Espo\Services\Record
}
$contact = $this->getEntityManager()->getRepository('Contact')->where(array(
'EmailAddress.id' => $email->get('fromEmailAddressId')
'emailAddresses.id' => $email->get('fromEmailAddressId')
))->findOne();
if ($contact) {
$case->set('contactId', $contact->id);

View File

@@ -2,7 +2,7 @@
<div id="msg-box" class="alert hide"></div>
<form id="nav">
<form id="nav" autocomplete="off">
<div class="row">
<div class=" col-md-6">
<div class="row">

View File

@@ -1,7 +1,7 @@
<div class="panel-body body">
<div id="msg-box" class="alert hide"></div>
<div class="loading-icon hide"></div>
<form id="nav">
<form id="nav" autocomplete="off">
<div class="row">
<div class="col-md-8" style="width:100%" >

View File

@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "3.2.1",
"version": "3.2.2",
"description": "",
"main": "index.php",
"repository": {