diff --git a/module/execution/css/all.css b/module/execution/css/all.css index 36584c5c7a..f13f24181c 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -35,3 +35,4 @@ canvas {height: 28px;} .parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 1px solid #cbd0db !important;} .parent.has-child.c-name.flex {margin-bottom: -2px !important;} #tableCustomBtn {padding-bottom: 5px;} +#bysearchTab {margin-left: 5px;} diff --git a/module/project/model.php b/module/project/model.php index 0abde41031..feb2bdddfe 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2369,7 +2369,7 @@ class projectModel extends model if(strpos($query, $allProject) !== false) $query = str_replace($allProject, '1', $query); - $query = str_replace(array('`id`', '`name`', '`status`', '`project`', '`PM`', '`openedBy`', '`openedDate`', '`begin`', '`end`', '`realBegan`', '`realEnd`', '`closedBy`', '`lastEditedDate`', '`closedDate`'), array('t1.`id`', 't1.`name`', 't1.`status`', 't1.`project`', 't1.`PM`', 't1.`openedBy`', 't1.`openedDate`', 't1.`begin`', 't1.`end`', 't1.`realBegan`', 't1.`realEnd`', 't1.`closedBy`', 't1.`lastEditedDate`', 't1.`closedDate`'), $query); + $query = preg_replace('/(`\w*`)/', 't1.$1',$query); } if($status == 'involved')