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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-08-11 15:02:29 +08:00
parent 6db420de76 2d17fc78ec
commit de0acf67ee
8 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/cron/model.php
+1 -1
View File
@@ -219,7 +219,7 @@ class cronModel extends model
if($cron->h === '' or preg_match('/[^0-9\*\-\/]/', $cron->h)) return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->h);
if($cron->dom === '' or preg_match('/[^0-9\*\-\/]/', $cron->dom))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->dom);
if($cron->mon === '' or preg_match('/[^0-9\*\-\/]/', $cron->mon))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->mon);
if($cron->dow === '' or preg_match('/[^0-9\*\-\/]/', $cron->dow))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->dow);
if($cron->dow === '' or preg_match('/[^0-9\*\-|,\/]/', $cron->dow))return sprintf($this->lang->cron->notice->errorRule, $this->lang->cron->dow);
if(empty($cron->command))return sprintf($this->lang->error->notempty, $this->lang->cron->command);
return null;
}
module/doc/css/objectlibs.css
+1
View File
@@ -2,3 +2,4 @@
.addbtn{padding-top:22px;height:63px; border:1px dashed #ddd; width:60px;}
.addbtn .icon-plus {font-size: 18px; display: block; opacity: 0.5; transition: opacity .2s; text-shadow: 1px 1px 3px rgba(0,0,0,.2);}
.addbtn:hover .icon-plus {opacity: .9; animation: flash-icon 1s linear alternate infinite}
#dropMenu{min-width:250px;padding:10px 15px;box-sizing:inhert;}
module/doc/view/showfiles.html.php
+6 -1
View File
@@ -49,8 +49,13 @@
$imageSize = getimagesize($file->realPath);
$imageWidth = $imageSize ? $imageSize[0] : 0;
}
$sessionString = $config->requestType == 'PATH_INFO' ? '?' : '&';
$sessionString .= session_name() . '=' . session_id();
$fileID = $file->id;
$url = helper::createLink('file', 'download', 'fileID=' . $fileID) . $sessionString ;
?>
<a class='media-wrapper' href='###' title='<?php echo $file->title . '.' . $file->extension?>' target='_blank' onclick="return downloadFile(<?php echo $file->id?>, '<?php echo $file->extension?>', <?php echo $imageWidth?>)">
<a class='media-wrapper' href='<?php echo $url;?>' title='<?php echo $file->title . '.' . $file->extension?>' target='_blank' onclick="return downloadFile(<?php echo $file->id?>, '<?php echo $file->extension?>', <?php echo $imageWidth?>)">
<?php
$downloadLink = $this->createLink('file', 'download', "fileID=$file->id&mouse=left");
if(in_array($file->extension, $config->file->imageExtensions))
module/my/view/managecontacts.html.php
+6 -4
View File
@@ -41,23 +41,25 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->user->contacts->listName;?></th>
<td>
<td class='w-300px'>
<div class='required required-wrapper'></div>
<?php
if($mode == 'new')
{
echo html::input('newList', '', "class='form-control w-300px'");
echo html::input('newList', '', "class='form-control'");
}
else
{
echo html::input('listName', $list->listName, "class='form-control w-300px'");
echo html::input('listName', $list->listName, "class='form-control'");
echo html::hidden('listID', $list->id);
}
?>
</td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->user->contacts->selectedUsers;?></th>
<td>
<td colspan='2'>
<?php
if($mode == 'new')
{
module/report/model.php
+1 -1
View File
@@ -261,7 +261,7 @@ class reportModel extends model
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
->where('t1.deleted')->eq(0)
->andWhere('t1.status')->notin('cancel, closed, done')
->andWhere('t1.status')->notin('cancel, closed, done, pause')
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.status')->notin('cancel, closed, done')
->beginIF($dept)->andWhere('t3.dept')->in($depts)->fi()
module/testtask/control.php
+1
View File
@@ -264,6 +264,7 @@ class testtask extends control
$this->config->testcase->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->testcase->allProduct);
$this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
$this->config->testcase->search['queryID'] = $queryID;
$this->config->testcase->search['fields']['assignedTo'] = $this->lang->testtask->assignedTo;
$this->config->testcase->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$this->config->testcase->search['actionURL'] = inlink('cases', "taskID=$taskID&browseType=bySearch&queryID=myQueryID");
module/testtask/css/cases.css
+4 -1
View File
@@ -2,6 +2,9 @@ tbody > tr > td > .btn-icon {margin-right: 3px;}
tbody > tr > td .icon-bug {margin-left: -8px;}
tfoot .table-actions #assignedTo_chosen a.chosen-default{height:26px;line-height:15px}
tfoot .table-actions .input-group-addon{padding:5px 12px;}
tfoot .table-actions .input-group-addon{padding:4px 12px;}
tfoot.fixedTfootAction .chosen-results li.active-result {color: black;}
tfoot .table-actions .input-group #assignedTo_chosen .chosen-single{height:24px;padding:3px 6px}
tfoot .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
tfoot .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
module/user/model.php
+21 -2
View File
@@ -936,7 +936,17 @@ class userModel extends model
$data->userList = join(',', $userList);
$data->account = $this->app->user->account;
$this->dao->insert(TABLE_USERCONTACT)->data($data)->exec();
if(empty($data->listName))
{
dao::$errors['listName'][] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
die(js::error(dao::getError()));
}
$this->dao->insert(TABLE_USERCONTACT)->data($data)
->autoCheck()
->exec();
if(dao::isError()) die(js::error(dao::getError()));
return $this->dao->lastInsertID();
}
@@ -955,7 +965,16 @@ class userModel extends model
$data->listName = $listName;
$data->userList = join(',', $userList);
$this->dao->update(TABLE_USERCONTACT)->data($data)->where('id')->eq($listID)->exec();
if(empty($data->listName))
{
dao::$errors['listName'][] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
die(js::error(dao::getError()));
}
$this->dao->update(TABLE_USERCONTACT)->data($data)
->where('id')->eq($listID)
->exec();
if(dao::isError()) die(js::error(dao::getError()));
}
/**