* fix for upgrade.
This commit is contained in:
@@ -86,7 +86,7 @@ class commonModel extends model
|
||||
{
|
||||
if($this->session->user)
|
||||
{
|
||||
$this->session->user->view = $this->loadModel('user')->grantUserView();
|
||||
if(!defined('IN_UPGRADE')) $this->session->user->view = $this->loadModel('user')->grantUserView();
|
||||
$this->app->user = $this->session->user;
|
||||
}
|
||||
elseif($this->app->company->guest or PHP_SAPI == 'cli')
|
||||
@@ -99,7 +99,7 @@ class commonModel extends model
|
||||
$user->admin = false;
|
||||
$user->rights = $this->loadModel('user')->authorize('guest');
|
||||
$user->groups = array('group');
|
||||
$user->view = $this->user->grantUserView($user->account, $user->rights['acls']);
|
||||
if(!defined('IN_UPGRADE')) $user->view = $this->user->grantUserView($user->account, $user->rights['acls']);
|
||||
$this->session->set('user', $user);
|
||||
$this->app->user = $this->session->user;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<div class="release-path">
|
||||
<ul class="release-line">
|
||||
<?php foreach($roadmap as $year => $branches):?>
|
||||
<?php $plans = $branches[0];?>
|
||||
<?php foreach($branches as $plans):?>
|
||||
<?php foreach($plans as $plan):?>
|
||||
<?php if(isset($plan->begin)):?>
|
||||
<li <?php if(date('Y-m-d') < $plan->begin) echo "class='active'";?>>
|
||||
@@ -42,6 +42,7 @@
|
||||
<?php endif;?>
|
||||
<?php endforeach;?>
|
||||
<?php endforeach;?>
|
||||
<?php endforeach;?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php echo html::a($this->createLink('product', 'roadmap', "productID={$product->id}"), $lang->product->iterationView . "<span class='label label-badge label-icon'><i class='icon icon-arrow-right'></i></span>", '', "class='btn btn-primary btn-circle btn-icon-right btn-sm pull-right'");?>
|
||||
|
||||
@@ -1839,7 +1839,7 @@ class upgradeModel extends model
|
||||
{
|
||||
$fromVersion = $this->config->installedVersion;
|
||||
$needProcess = array();
|
||||
if(strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($config->installedVersion, 'pro5.4', '<')) $needProcess['updateFile'] = true;
|
||||
if(strpos($fromVersion, 'biz') === false and (strpos($fromVersion, 'pro') === false ? version_compare($fromVersion, '8.3', '<') : version_compare($fromVersion, 'pro5.4', '<'))) $needProcess['updateFile'] = true;
|
||||
return $needProcess;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user