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-21 09:09:44 +08:00
parent 3f431a2110 f294f9b181
commit 0479f33e15
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/view/showfiles.html.php
+2 -2
View File
@@ -78,8 +78,8 @@
<td><?php echo isset($file->addedDate) ? substr($file->addedDate, 0, 10) : '';?></td>
<td class='text-center'>
<?php
commonModel::printLink('file', 'download', "fileID=$file->id", $lang->doc->download, "data-toggle='modal'");
commonModel::printLink('file', 'delete', "fileID=$file->id", $lang->delete, "class='deleter'");
common::printLink('file', 'download', "fileID=$file->id", $lang->doc->download, "data-toggle='modal'");
common::printLink('file', 'delete', "fileID=$file->id", $lang->delete, 'hiddenwin');
?>
</td>
</tr>
module/project/config.php
+6 -5
View File
@@ -18,11 +18,12 @@ $config->project->custom = new stdclass();
$config->project->custom->batchEditFields = 'days,status,PM';
$config->project->editor = new stdclass();
$config->project->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
$config->project->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
$config->project->editor->putoff = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->editor->close = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
$config->project->editor->edit = array('id' => 'desc', 'tools' => 'simpleTools');
$config->project->editor->putoff = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->editor->close = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools');
$config->project->search['module'] = 'task';
$config->project->search['fields']['name'] = $lang->task->name;
module/project/view/activate.html.php
+1
View File
@@ -12,6 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::import($jsRoot . 'misc/date.js');?>
<div class='container'>
<div id='titlebar'>
module/task/js/batchcreate.js
+1 -1
View File
@@ -50,7 +50,7 @@ function setStoryRelated(num)
var link = createLink('story', 'ajaxGetModule', 'storyID=' + storyID);
$.get(link, function(moduleID)
{
$('#module' + num).val(moduleID);
$('#module' + num).val(parseInt(moduleID));
$('#module' + num).trigger("chosen:updated");
});
}