* finish task #6993.
This commit is contained in:
@@ -20,6 +20,7 @@ class xuanxuanMessage extends messageModel
|
||||
$onlybody = isset($_GET['onlybody']) ? $_GET['onlybody'] : '';
|
||||
unset($_GET['onlybody']);
|
||||
$url = $server . helper::createLink($objectType, 'view', "id=$objectID", 'xhtml');
|
||||
$url = "xxc:openInApp/zentao-integrated/" . urlencode($url);
|
||||
|
||||
$target = '';
|
||||
if(!empty($object->assignedTo)) $target .= $object->assignedTo;
|
||||
|
||||
@@ -23,6 +23,8 @@ class myMisc extends misc
|
||||
$loginInfo->ui->defaultUser = new stdclass();
|
||||
$loginInfo->ui->defaultUser->server = common::getSysURL();;
|
||||
$loginInfo->ui->defaultUser->account = $this->app->user->account;
|
||||
$loginInfo->ui->defaultUser->lock = false;
|
||||
$loginInfo->ui->defaultUser->ldap = true;
|
||||
$loginInfo = json_encode($loginInfo);
|
||||
|
||||
$loginFile = $clientDir . 'config.json';
|
||||
|
||||
@@ -56,6 +56,26 @@ class myMisc extends misc
|
||||
if(strpos($agentOS, 'Mac') !== false) $os = 'mac64';
|
||||
|
||||
$this->view->os = $os;
|
||||
|
||||
$releasedInDB = $this->dao->select('*')->from(TABLE_IM_CLIENT)->where('version')->eq($this->config->xuanxuan->version)->andWhere('status')->eq('released')->fetch();
|
||||
if($releasedInDB)
|
||||
{
|
||||
foreach(json_decode($releasedInDB->downloads) as $osKey => $link)
|
||||
{
|
||||
if(empty($link))
|
||||
{
|
||||
$osKey = strtolower(str_replace('zip', '', $osKey));
|
||||
if(isset($this->lang->misc->client->osList[$osKey]))
|
||||
{
|
||||
unset($this->lang->misc->client->osList[$osKey]);
|
||||
}
|
||||
elseif(strpos($osKey, 'mac') === 0)
|
||||
{
|
||||
unset($this->lang->misc->client->osList['mac64']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($action == 'getPackage')
|
||||
|
||||
Reference in New Issue
Block a user