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

* Fix bug #26419,26417.

Browse Source
This commit is contained in:
tanghucheng
2022-08-15 12:26:44 +08:00
parent a84ae59d3b
commit c816179a08
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/task/ext/config/lite.php
+1 -1
View File
@@ -7,4 +7,4 @@ $config->task->datatable->fieldList['lane']['title'] = 'lane';
$config->task->datatable->fieldList['lane']['fixed'] = 'no';
$config->task->datatable->fieldList['lane']['width'] = '120';
$config->task->datatable->fieldList['lane']['required'] = 'no';
$config->task->datatable->fieldList['lane']['sort'] = 'no';
$config->task->datatable->fieldList['lane']['sort'] = 'no';
module/caselib/css/showimport.css
Vendored
-1
View File
@@ -1,2 +1 @@
.table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;}
.c-pri{width: 70px;}
module/caselib/view/showimport.html.php
+9 -4
View File
@@ -14,11 +14,12 @@ $datas = $datas->datas;
?>
<style>
form{overflow-x: scroll}
.c-pri, .c-estStarted, .c-deadline{width:100px;}
thead > tr > th{width:150px;}
.c-estimate {width:150px;}
.c-story{width:150px;}
.c-team {width:100px; padding:0px 0px 8px 0px !important;}
.c-estimate-1 {width:50px;padding:0px 0px 8px 8px !important;}
.c-step{width:400px;}
.c-pri,.c-stage{width:150px}
.c-precondition{width:200px;}
</style>
<?php if(!empty($suhosinInfo)):?>
<div class='alert alert-info'><?php echo $suhosinInfo?></div>
@@ -37,7 +38,11 @@ $(function()
{
if(parseInt($('#maxImport').val())) $('#times').html(Math.ceil(parseInt($('#allCount').html()) / parseInt($('#maxImport').val())));
});
$('#import').click(function(){location.href = createLink('caselib', 'showImport', "libID=<?php echo $libID;?>&pageID=1&maxImport=" + $('#maxImport').val())})
$('#import').click(function()
{
$.cookie('maxImport', $('#maxImport').val());
location.href = createLink('caselib', 'showImport', "libID=<?php echo $libID;?>&pageID=1&maxImport=" + $('#maxImport').val())
});
});
</script>
<?php else:?>
module/port/model.php
+3
View File
@@ -642,6 +642,7 @@ class portModel extends model
foreach($listFields as $field)
{
$listName = $field . 'List';
if(!empty($_POST[$listName])) continue;
if(!empty($fieldList[$field]))
{
$lists[$listName] = $fieldList[$field]['values'];
@@ -901,6 +902,8 @@ class portModel extends model
$result->isEndPage = $pagerID >= $result->allPager;
$result->datas = $datas;
$this->session->set('insert', true);
foreach($datas as $data)
{
if(isset($data->id)) $this->session->set('insert', false);
module/port/view/header.html.php
+2 -1
View File
@@ -18,8 +18,9 @@ $notEmptyRule = $this->session->notEmptyRule;
form{overflow-x: scroll}
#maxImport:focus {outline: none;}
.pointorNone{pointer-events:none;}
thead > tr > th{width:150px;}
.c-pri{width:100px}
#showData > thead > tr > th{width:150px;}
.c-precondition{width:200px;}
.c-id{width:50px}
.c-team {width:100px; padding:0px 0px 8px 0px !important;}
.c-estimate-1 {width:50px;padding:0px 0px 8px 8px !important;}