Skip to content

Commit

Permalink
[BF] addition fixes for #222 and #217
Browse files Browse the repository at this point in the history
  • Loading branch information
barryo committed Jun 29, 2015
1 parent 56bef0f commit 7791a8b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions application/controllers/CustomerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ protected function listGetData( $id = null )
$qb->andWhere( 'c.type = :ctype' )->setParameter( 'ctype', $ctype );

$this->view->customerStates = $customerStates = \Entities\Customer::$CUST_STATUS_TEXT;
$this->view->cstate = $cstate = $this->getSessionNamespace()->cust_list_cstate
$this->view->cstate = $cstate = $this->getSessionNamespace()->cust_list_cstate
= $this->getParam( 'cstate', ( $this->getSessionNamespace()->cust_list_cstate !== null ? $this->getSessionNamespace()->cust_list_cstate : false ) );
if( $cstate && isset( $customerStates[$cstate] ) )
$qb->andWhere( 'c.status = :cstate' )->setParameter( 'cstate', $cstate );
Expand Down Expand Up @@ -518,7 +518,6 @@ protected function formPostProcess( $form, $object, $isEdit, $options = null, $c

$form->enableResller( $this->resellerMode() );
$form->setMultiIXP( $this->multiIXP(), $isEdit );
$form->setAs112client( $this->as112UiActive(), $isEdit );

if( $this->resellerMode() )
{
Expand Down Expand Up @@ -762,4 +761,3 @@ public function unreadNotesAction()
$this->view->notes = $latestNotes;
}
}

2 changes: 1 addition & 1 deletion application/views/customer/overview-tabs/ports/port.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{assign var='isLAG' value=1}
        LAG Port
{else}
{tmplinclude file='customer/overview-tabs/ports/physintstatus.phtml'}
{tmplinclude file='customer/overview-tabs/ports/physintstatus.phtml' pi=$physInts[0]}
{assign var='isLAG' value=0}
{/if}
</small>
Expand Down

0 comments on commit 7791a8b

Please sign in to comment.