mirror of
https://github.com/espocrm/espocrm.git
synced 2026-03-08 07:27:00 +00:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f45e26028 | ||
|
|
f6892877c1 | ||
|
|
c7cc44edf6 | ||
|
|
e958d7c488 | ||
|
|
77ff11990b | ||
|
|
994e0c1eda | ||
|
|
d51e88be60 |
@@ -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');
|
||||
|
||||
@@ -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.');
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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%" >
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "3.2.1",
|
||||
"version": "3.2.2",
|
||||
"description": "",
|
||||
"main": "index.php",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user