|
@@ -112,9 +112,12 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
if($this->isCurrentRoute('edit')) {
|
|
|
|
|
|
if($this->getParameter('tr069_service')) {
|
|
|
+ $object = $this->getSubject();
|
|
|
$serviceName = $this->getParameter('tr069_api');
|
|
|
+ if($model = $object->getModel()) {
|
|
|
+ if($model->getData('tr069_api')) $serviceName = $model->getData('tr069_api');
|
|
|
+ }
|
|
|
$tr069 = $this->get($serviceName);
|
|
|
- $object = $this->getSubject();
|
|
|
|
|
|
$query = array('$or' => array());
|
|
|
if($object->getSerialNumber()) {
|
|
@@ -260,7 +263,12 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
->end();
|
|
|
|
|
|
if($this->getParameter('tr069_service')) {
|
|
|
+ $object = $this->getSubject();
|
|
|
$serviceName = $this->getParameter('tr069_api');
|
|
|
+ if($model = $object->getModel()) {
|
|
|
+ if($model->getData('tr069_api')) $serviceName = $model->getData('tr069_api');
|
|
|
+ }
|
|
|
+
|
|
|
$tr069 = $this->get($serviceName);
|
|
|
$object = $this->getSubject();
|
|
|
|
|
@@ -376,6 +384,9 @@ class ONUAdmin extends WorkflowBaseAdmin
|
|
|
$status = ($this->getForm()->get('tr069_status')->getData()) ?? null;
|
|
|
|
|
|
$serviceName = $this->getParameter('tr069_api');
|
|
|
+ if($model = $onu->getModel()) {
|
|
|
+ if($model->getData('tr069_api')) $serviceName = $model->getData('tr069_api');
|
|
|
+ }
|
|
|
$tr069 = $this->get($serviceName);
|
|
|
|
|
|
if(!is_null($catv)) $aux = $tr069->setCATV($id, $catv);
|