Changeset 384

Timestamp:

10/05/07 20:46:36 (1 year ago)

Author:

bermiferrer

Message:

Adding support for module shared model. If a module admin exists and there is a file at app/models/admin_controller.php, it will be included before the module controller.
Adding support for module default layout. Controllers inside modules, will have app/views/layouts/module_name.tpl as their default layout.

Files:

• trunk/config/locales/en.php (modified) (1 diff)
• trunk/config/locales/es.php (modified) (1 diff)
• trunk/lib/AkActionController.php (modified) (7 diffs)
• trunk/lib/AkRequest.php (modified) (2 diffs)

trunk/config/locales/en.php

@@ -155 +155 @@
-$dictionary['Please add force=true to the argument list in order to overwrite existing files.'] = 'Please add force=true to the argument list in order to overwrite existing files.';
-
+// 2007-10-06 3:15:57
+
+
+$dictionary['Could not find a helper to handle the method "%method" you called in your view'] = 'Could not find a helper to handle the method "%method" you called in your view';
+
-
-?>

trunk/config/locales/es.php

@@ -149 +149 @@
-$dictionary['Please add force=true to the argument list in order to overwrite existing files.'] = 'Please add force=true to the argument list in order to overwrite existing files.';
-
+// 2007-10-06 3:15:57
+
+
+$dictionary['Could not find a helper to handle the method "%method" you called in your view'] = 'Could not find a helper to handle the method "%method" you called in your view';
+
-
-?>

trunk/lib/AkActionController.php

@@ -125 +125 @@
-    
-    var $module_name;
-
+
+
-    /**
-     * Old fashioned way of dispatching requests. Please use AkDispatcher or roll your own.
@@ -235 +236 @@
-    {
-        $helpers = $this->getDefaultHelpers();
-
-        $helpers = array_merge($helpers, $this->getApplicationHelpers());
-
+
-        require_once(AK_LIB_DIR.DS.'AkActionView'.DS.'AkActionViewHelper.php');
-
-        $current_controller_helper = $this->getControllerName();
-
+
+
-        if(file_exists($current_controller_helper_file_name)){
-            $helpers[$current_controller_helper_file_name] = $current_controller_helper;
@@ -286 +287 @@
-    {
-        $helper_names = array();
-
-        if ($this->app_helpers == 'all' ){
-            $available_helpers = Ak::dir(AK_HELPERS_DIR,array('dirs'=>false));
@@ -520 +520 @@
-        $this->_flash_handled ? null : $this->_handleFlashAttribute();
-
-        // Ror Backwards compatibility
-        if(!is_array($options)){
-            return $this->renderFile(empty($options) ? $this->getDefaultTemplateName() : $options, $status, true);
@@ -778 +777 @@
-
-        if(!isset($this->controller_name)){
-get_class($this
+str_replace('_', '::', get_class($this)
-
-            $included_controllers = $this->_getIncludedControllerNames();
-filter($included_controllers, 'strtolower'
+map('strtolower', $included_controllers
-            $key = array_search(strtolower($current_class_name), $lowercase_included_controllers, true);
-            $found_controller = substr($included_controllers[$key], 0, -10);
@@ -807 +806 @@
-            $this->module_name = join('/', array_map(array('AkInflector','underscore'), strstr($module_parts, '::') ? explode('::', $module_parts) : array($module_parts)));
-            $this->controller_name = substr($this->controller_name, strrpos($this->controller_name, '::')+2);
+
-        }
-    }
@@ -1372 +1372 @@
-        if(!empty($layout)){
-            $layout = strstr($layout,'/') || strstr($layout,DS) ? $layout : 'layouts'.DS.$layout;
-
+
+
+
-            if (file_exists($layout)) {
-                return $layout;

trunk/lib/AkRequest.php

@@ -746 +746 @@
-        if(!empty($params['module'])){
-            $module_path = trim(str_replace(array('/','\\'), DS, Ak::sanitize_include($params['module'], 'high')), DS).DS;
+            $module_shared_model = AK_CONTROLLERS_DIR.DS.trim($module_path,DS).'_controller.php';
-            $module_class_peffix = str_replace(' ','_',AkInflector::titleize(str_replace(DS,' ', trim($module_path, DS)))).'_';
-        }
@@ -753 +754 @@
-        $controller_path = AK_CONTROLLERS_DIR.DS.$module_path.$controller_file_name;
-        include_once(AK_APP_DIR.DS.'application_controller.php');
+        
+        if(!empty($module_path) && file_exists($module_shared_model)){
+            include_once($module_shared_model);
+        }
+        
-        if(@!include_once($controller_path)){
-            trigger_error(Ak::t('Could not find the file /app/controllers/<i>%controller_file_name</i> for '.