Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#17082,17990

Browse Source
This commit is contained in:
zenggang
2022-04-14 06:28:31 +00:00
parent b2907d1cef
commit 6908956c24
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/js/x.create.js
+1 -1
View File
@@ -2,7 +2,7 @@ $(function()
{
$('#sourceNote').prev('span').remove();
$('#sourceNote').remove();
$('table tbody tr th').addClass('w-70px');
$('table tbody tr th').addClass('w-100px');
$('#tplBoxWrapper .btn-toolbar .btn-group').remove();
})
module/user/model.php
+7
View File
@@ -891,6 +891,13 @@ class userModel extends model
/* Create cycle todo in login. */
$todoList = $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->andWhere('deleted')->eq('0')->andWhere('account')->eq($user->account)->fetchAll('id');
$this->loadModel('todo')->createByCycle($todoList);
/* Fix bug #17082. */
if($user->avatar)
{
$avatarRoot = substr($user->avatar, 0, strpos($user->avatar, 'data/upload/'));
if($this->config->webRoot != $avatarRoot) $user->avatar = substr_replace($user->avatar, $this->config->webRoot, 0, strlen($avatarRoot));
}
}
return $user;
}