Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed vlan display in Cpeprovisioning

Browse Source
This commit is contained in:
Frank Schubert
2021-11-02 19:44:36 +01:00
parent 6ca68a60d5
commit d833c7583f
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Layout/default/Cpeprovisioning/Index.php
View File

@@ -77,22 +77,22 @@
<td><?=$product->product->attributes['bras_type']->value?> - Down: <?=$product->product->attributes["bw_down"]->value?> / Up: <?=$product->product->attributes["bw_up"]->value?></td>
<td class="text-monospace">
<?php if($product->termination_id): ?>
<?php if($product->termination->building->pop->vlan_public): ?>
<?php if($product->termination->getPop()->vlan_public): ?>
<label class="order-date-pill active pointer">
Public: <strong><?=$product->termination->building->pop->vlan_public?></strong>
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_public?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
Public: <strong><?=$product->termination->getPop()->vlan_public?></strong>
<input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_public?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->building->pop->vlan_nat): ?>
<?php if($product->termination->getPop()->vlan_nat): ?>
<label class="order-date-pill active pointer">
NAT: <strong><?=$product->termination->building->pop->vlan_nat?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_nat?>" <?=($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : ""?> />
NAT: <strong><?=$product->termination->getPop()->vlan_nat?></strong>
<input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_nat?>" <?=($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php if($product->termination->building->pop->vlan_ipv6): ?>
<?php if($product->termination->getPop()->vlan_ipv6): ?>
<label class="order-date-pill active pointer">
IPv6: <strong><?=$product->termination->building->pop->vlan_ipv6?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->building->pop->vlan_ipv6?>" <?=($product->cpeprovisioning->vlan_ipv6) ? "checked='checked'" : ""?> />
IPv6: <strong><?=$product->termination->getPop()->vlan_ipv6?></strong>
<input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_ipv6?>" <?=($product->cpeprovisioning->vlan_ipv6) ? "checked='checked'" : ""?> />
</label>
<?php endif; ?>
<?php else: ?>

16
application/Termination/Termination.php
View File

@@ -33,6 +33,22 @@ class Termination extends mfBaseModel {
return $address;
}
public function getWorkflowvalue($itemname, $type = "string") {
if(array_key_exists($itemname, $this->getProperty("workflowitems"))) {
return $this->getProperty("workflowitems")[$itemname]->value->{"value_$type"};
}
return null;
}
public function getPop() {
$pop_id = $this->getWorkflowvalue('pop_id');
if(!$pop_id) {
return null;
}
return new Pop($pop_id);
}
public function getNewObjectCode() {
if(!$this->building_id) {
return false;