Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21422#21455#21413 See merge request easycorp/zentaopms!2733
This commit is contained in:
@@ -337,7 +337,7 @@
|
||||
<?php js::set('executionID', $execution->id);?>
|
||||
<?php if(isonlybody()):?>
|
||||
<style>
|
||||
.body-modal .main-header {padding-right: 0px; z-index: 1100;}
|
||||
.body-modal .main-header {padding-right: 0px; z-index: 1000;}
|
||||
.btn-toolbar > .dropdown {margin: 0px;}
|
||||
</style>
|
||||
<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
|
||||
|
||||
@@ -1007,7 +1007,7 @@ function deleteCard(objectType, objectID, regionID)
|
||||
url: url,
|
||||
success: function(data)
|
||||
{
|
||||
updateRegion(regionID, data[regionID]);
|
||||
updateRegion(regionID, data[regionID]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1404,7 +1404,8 @@ class kanban extends control
|
||||
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
|
||||
|
||||
$kanbanID = $this->kanban->getKanbanIDByregion($regionID);
|
||||
$kanbanGroup = $this->kanban->getRDKanban($kanbanID);
|
||||
$$browseType = $this->config->vision == 'lite' ? 'task' : 'all';
|
||||
$kanbanGroup = $this->kanban->getRDKanban($kanbanID, $$browseType);
|
||||
|
||||
return print(json_encode($kanbanGroup));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user