openrat-cms

commit ecaf088c69f9feccaeb6240ffa6729baf21768a6
parent 0782330f82a6ffa1fc41063db0d55498b8dc833b
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 29 Aug 2019 23:10:01 +0200

Cleanup: Embed-Views vollständig ausgebaut.

Diffstat:
modules/cms-core/Dispatcher.class.php
 | 
5
++---
modules/cms-ui/themes/default/layout/index.php
 | 
17
+++--------------

2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/modules/cms-core/Dispatcher.class.php b/modules/cms-core/Dispatcher.class.php
@@ -273,11 +273,10 @@ class Dispatcher
 
     /**
      * Aufruf der Action-Methode.
-     * Diese Methode muss public sein, da sie für Embedded-Actions aus dem UI direkt aufgerufen wird.
      *
      * @return array Vollständige Rückgabe aller Daten als assoziatives Array
      */
-    public function callActionMethod()
+    private function callActionMethod()
     {
         global $REQ;
         $actionClassName = ucfirst($this->request->action) . 'Action';
@@ -317,7 +316,7 @@ class Dispatcher
         if   ( ! $this->request->isAction && $this->request->action != 'index' )
             Session::close();
 
-        Logger::debug("Dispatcher executing {$this->request->action}/{$this->request->method}/" . @$REQ[REQ_PARAM_ID].' -> '.$actionClassName.'#'.$subactionMethodName.'() embed='.$this->request->isEmbedded);
+        Logger::debug("Dispatcher executing {$this->request->action}/{$this->request->method}/" . @$REQ[REQ_PARAM_ID].' -> '.$actionClassName.'#'.$subactionMethodName.'()');
 
 
         try {
diff --git a/modules/cms-ui/themes/default/layout/index.php b/modules/cms-ui/themes/default/layout/index.php
@@ -31,7 +31,6 @@
 <div id="workbench" class="initial-hidden">
 
     <header id="title" class="view view-static" data-action="title" data-method="show">
-        <?php echo embedView('title','show', 0); ?>
     </header>
 
 
@@ -42,7 +41,6 @@
                 <a href=""></a>
             </header>
             <div id="navigation" class="or-navtree view view-static" data-action="tree" data-method="tree">
-                <?php embedView('tree','tree',0); ?>
             </div>
 
         </nav>
@@ -84,7 +82,7 @@
                     -->
 
 
-                <div class="view view-loader closable" data-method="<?php echo $method['name'] ?>"><?php if($method ['open']) {embedView($action,$method['name'],$id);}else{echo '';} ?></div>
+                <div class="view view-loader closable" data-method="<?php echo $method['name'] ?>"></div>
 
             </section>
             <?php } ?>
@@ -100,10 +98,6 @@
 <?php /* Modal dialog */ ?>
 <div id="dialog" class="is-<?php echo empty($dialogAction)?'closed':'open' ?>" data-action="<?php echo (!empty($dialogAction)?$dialogAction:'') ?>" data-method="<?php echo (!empty($dialogMethod)?$dialogMethod:'') ?>">
     <div class="view or-round-corners">
-        <?php // Shows directly a modal dialog (if present)
-              if(!empty($dialogAction))
-                  embedView($dialogAction,$dialogMethod, 0);
-        ?>
     </div>
 
     <div class="filler"><?php /* empty element, this is only for styling the background. */ ?>
@@ -127,9 +121,4 @@
 <noscript><div class="noscript"><em>Javascript is required to view this site</em></div></noscript>
 
 </body>
-</html>
-<?php
-function embedView( $action, $method,$id ) {
-        //cms_ui\UI::executeEmbedded($action,$method,$id);
-}
-?>-
\ No newline at end of file
+</html>+
\ No newline at end of file