diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d670e81f..3e7a756a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -383,6 +383,11 @@ class HomeController extends Controller : view('frames.'.$key['cmd'])) ->with('bases',$this->bases()); + // If we are rendering a DN, rebuild our object + $o = config('server')->fetch($key['dn']); + foreach (collect(old())->except(['dn','_token']) as $attr => $value) + $o->{$attr} = $value; + return match ($key['cmd']) { 'create' => $view ->with('container',old('container',$key['dn'])) @@ -390,7 +395,8 @@ class HomeController extends Controller 'dn' => $view ->with('dn',$key['dn']) - ->with('page_actions',collect(['edit'=>TRUE,'copy'=>TRUE])), + ->with('o',$o) + ->with('page_actions',collect(['edit'=>TRUE])), 'import' => $view, diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php index b7a7517c..b74fcc4e 100644 --- a/resources/views/frames/dn.blade.php +++ b/resources/views/frames/dn.blade.php @@ -1,7 +1,7 @@ @extends('layouts.dn') @section('page_title') - @include('fragment.dn.header',['o'=>($o=config('server')->fetch($dn))]) + @include('fragment.dn.header',['o'=>($o ?? $o=config('server')->fetch($dn))]) @endsection @section('main-content')