baculum: Changes to proper working list type controls on page load

diff --git a/gui/baculum/protected/Web/Pages/FileSetView.php b/gui/baculum/protected/Web/Pages/FileSetView.php
index 2756091187c06b8ede5d398af23c7236b4c19229..306e5bf5aae61131ef88929b22c581bfe186b78d 100644 (file)
--- a/gui/baculum/protected/Web/Pages/FileSetView.php
+++ b/gui/baculum/protected/Web/Pages/FileSetView.php
@@ -40,8 +40,8 @@ class FileSetView extends BaculumWebPage {
                }
        }
 
-       public function onLoad($param) {
-               parent::onLoad($param);
+       public function onPreRender($param) {
+               parent::onPreRender($param);
                if ($this->getPage()->IsCallBack || $this->getPage()->IsPostBack) {
                        return;
                }

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php b/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php
index c955411fb569438cec5007227be13647ae4ead3e..eb5d5c071d5685a48fc00adb81a6edbe39f5d9b3 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveListTemplate.php
@@ -65,11 +65,16 @@ class DirectiveListTemplate extends ConfigListTemplate implements IActiveControl
                $cmd = $this->getCmdParam();
                if ($this->getPage()->IsCallBack && (!$cmd || $cmd === 'show_all_directives') && method_exists($this, 'loadConfig')) {
                        $this->loadConfig();
+               } elseif (!$this->getPage()->IsCallBack && !$this->getPage()->IsPostBack) {
+                       $this->display_directive = $this->getShow();
                }
-               if ($this->getPage()->IsCallBack || $this->getPage()->IsPostBack) {
-                       return;
+       }
+
+       public function onLoad($param) {
+               parent::onLoad($param);
+               if (!$this->getPage()->IsCallBack && !$this->getPage()->IsPostBack && method_exists($this, 'loadConfig')) {
+                       $this->loadConfig();
                }
-               $this->display_directive = $this->getShow();
        }
 
        public function getHost() {