added status_id default filter in workflow
This commit is contained in:
@@ -66,7 +66,7 @@
|
|||||||
<?php if(is_array($filter)): ?>
|
<?php if(is_array($filter)): ?>
|
||||||
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
|
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<?=(($me->is("lineworker") && !$me->isAdmin()) && $status->id == 3) ? "selected='selected'" : ""?>
|
<?=(!array_key_exists("status_id", $filter) && $status->id == 3) ? "selected='selected'" : ""?>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
>
|
>
|
||||||
<?=$status->code?> - <?=__($status->name."-t")?></option>
|
<?=$status->code?> - <?=__($status->name."-t")?></option>
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
<?php if(is_array($filter)): ?>
|
<?php if(is_array($filter)): ?>
|
||||||
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
|
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
<?=(($me->is("pipeworker") && !$me->isAdmin()) && $status->id == 3) ? "selected='selected'" : ""?>
|
<?=(!array_key_exists("status_id", $filter) && $status->id == 3) ? "selected='selected'" : ""?>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
>
|
>
|
||||||
<?=$status->code?> - <?=__($status->name."-b")?></option>
|
<?=$status->code?> - <?=__($status->name."-b")?></option>
|
||||||
|
|||||||
@@ -82,14 +82,16 @@ class LineworkController extends mfBaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner", "lineplanner","netowner"])) {
|
if($this->me->is("lineworker") && !$this->me->is(["Admin","pipeplanner", "lineplanner","netowner"])) {
|
||||||
$this->log->debug("is lineworker");
|
$this->log->debug("is lineworker");
|
||||||
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
|
$termination_search["lineworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
|
||||||
|
//var_dump($filter);exit;
|
||||||
if(!count($filter)) {
|
}
|
||||||
$termination_search["status_id"] = 3;
|
|
||||||
}
|
if(!array_key_exists("status_id", $filter)) {
|
||||||
|
$termination_search["status_id"] = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
$networks = [];
|
$networks = [];
|
||||||
|
|||||||
@@ -84,15 +84,13 @@ class PipeworkController extends mfBaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if($this->me->is("pipeworker") && !$this->me->is(["Admin","pipeplanner","netowner"])) {
|
if($this->me->is("pipeworker") && !$this->me->is(["Admin","pipeplanner","netowner"])) {
|
||||||
$this->log->debug("is pipeworker");
|
$this->log->debug("is pipeworker");
|
||||||
$building_search["pipeworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
|
$building_search["pipeworker_id"] = ($this->me->address->parent_id) ? $this->me->address->parent_id : $this->me->address_id;
|
||||||
|
}
|
||||||
|
|
||||||
if(!count($filter)) {
|
if(!array_key_exists("status_id", $filter)) {
|
||||||
$building_search["status_id"] = 3;
|
$building_search["status_id"] = 3;
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$pagination['maxItems'] = BuildingModel::count($building_search);
|
$pagination['maxItems'] = BuildingModel::count($building_search);
|
||||||
|
|||||||
Reference in New Issue
Block a user