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

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

Browse Source
This commit is contained in:
daitingting
2018-05-28 14:21:11 +08:00
parent e03ecf66f7 57e3dae49c
commit 6aab48e304
14 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/batchedit.css
+2 -1
View File
@@ -1,3 +1,4 @@
.chosen-container[id^="plan"] .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
.duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px}
.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
#batchEditForm{overflow-x:auto;}
module/common/lang/en.php
+1
View File
@@ -57,6 +57,7 @@ $lang->required = 'Required';
$lang->noData = 'No record';
$lang->actions = 'Actions';
$lang->restore = 'Restore';
$lang->comment = 'Note';
$lang->history = 'History';
$lang->attatch = 'Attachment';
module/common/lang/zh-cn.php
+1
View File
@@ -57,6 +57,7 @@ $lang->required = '必填';
$lang->noData = '暂无';
$lang->actions = '操作';
$lang->restore = '恢复默认';
$lang->comment = '备注';
$lang->history = '历史记录';
$lang->attatch = '附件';
module/common/view/customfield.html.php
+1
View File
@@ -27,6 +27,7 @@
<div>
<?php echo html::submitButton($lang->save);?>
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
<?php echo html::a($customLink, $lang->restore, 'hiddenwin', "class='btn'");?>
</div>
</form>
</div>
module/common/view/noticeimport.html.php
+2 -2
View File
@@ -6,7 +6,7 @@
<h4 class="modal-title"><?php echo $lang->importConfirm;?></h4>
</div>
<div class="modal-body">
<?php echo html::hidden('insert', '');?>
<?php echo html::hidden('insert', 0);?>
<div class='alert with-icon'>
<i class="icon icon-exclamation-sign"></i>
<div class="content">
@@ -25,7 +25,7 @@
<script>
function submitForm(type)
{
$('#insert').val(type == 'insert' ? 1 : 0);
$('.modal-body #insert').val(type == 'insert' ? 1 : 0);
$("button[data-target='#importNoticeModal']").closest('form').submit();
}
</script>
module/custom/control.php
+10 -3
View File
@@ -327,9 +327,16 @@ class custom extends control
public function ajaxSaveCustomFields($module, $section, $key)
{
$account = $this->app->user->account;
$fields = $this->post->fields;
if(is_array($fields)) $fields = join(',', $fields);
$this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields);
if($_POST)
{
$fields = $this->post->fields;
if(is_array($fields)) $fields = join(',', $fields);
$this->loadModel('setting')->setItem("$account.$module.$section.$key", $fields);
}
else
{
$this->loadModel('setting')->deleteItems("owner=$account&module=$module&section=$section&key=$key");
}
die(js::reload('parent'));
}
module/project/model.php
+1
View File
@@ -336,6 +336,7 @@ class projectModel extends model
$members = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($copyProjectID)->andWhere('type')->eq('project')->fetchAll();
foreach($members as $member)
{
unset($member->id);
$member->root = $projectID;
$member->join = $today;
$member->days = $project->days;
module/story/css/batchedit.css
+1
View File
@@ -1,2 +1,3 @@
#suhosinInfo {margin-bottom: 0;}
.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
#batchEditForm{overflow-x:auto}
module/task/config.php
+2 -2
View File
@@ -99,13 +99,13 @@ $config->task->datatable->fieldList['left']['required'] = 'no';
$config->task->datatable->fieldList['progress']['title'] = 'progress';
$config->task->datatable->fieldList['progress']['fixed'] = 'no';
$config->task->datatable->fieldList['progress']['width'] = '70';
$config->task->datatable->fieldList['progress']['width'] = '50';
$config->task->datatable->fieldList['progress']['required'] = 'no';
$config->task->datatable->fieldList['progress']['sort'] = 'no';
$config->task->datatable->fieldList['deadline']['title'] = 'deadlineAB';
$config->task->datatable->fieldList['deadline']['fixed'] = 'no';
$config->task->datatable->fieldList['deadline']['width'] = '70';
$config->task->datatable->fieldList['deadline']['width'] = '60';
$config->task->datatable->fieldList['deadline']['required'] = 'no';
$config->task->datatable->fieldList['openedBy']['title'] = 'openedByAB';
module/task/css/batchedit.css
+1
View File
@@ -1 +1,2 @@
.chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
#batchEditForm{overflow-x:auto;}
module/task/view/batchedit.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
}
}
?>
<form class='main-form' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
<form id='batchEditForm' class='main-form' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "projectID={$projectID}")?>">
<table class='table table-form table-fixed with-border'>
<thead>
<tr>
module/testcase/model.php
+7 -1
View File
@@ -1031,7 +1031,7 @@ class testcaseModel extends model
}
}
$cases[$key] =$caseData;
$cases[$key] = $caseData;
}
$forceNotReview = $this->forceNotReview();
@@ -1387,6 +1387,12 @@ class testcaseModel extends model
echo $case->stepNumber;
break;
case 'actions':
if($case->needconfirm or $browseType == 'needconfirm')
{
if(common::hasPriv('testcase', 'confirmchange')) echo html::a(helper::createLink('testcase', 'confirmchange', "caseID=$case->id"), $this->lang->confirm, 'hiddenwin', "class='btn-wide'");
break;
}
echo "<div class='more'>";
if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe');
module/testcase/view/showimport.html.php
+1 -1
View File
@@ -99,7 +99,7 @@
{
echo html::submitButton('', '', 'btn btn-primary btn-wide');
}
echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide')
echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide');
?>
</td>
</tr>
module/tree/view/browse.html.php
-1
View File
@@ -252,7 +252,6 @@ $(function()
var tree = $tree.data('zui.tree');
if(<?php echo $currentModuleID ?>)
if(0)
{
var $currentLi = $tree.find('.module-name[data-id=' + <?php echo $currentModuleID ?> + ']').closest('li');
if($currentLi.length) tree.show($currentLi);