fixing relations

infinitas · Jan 18, 2010 · 4af9024 · 4af9024
1 parent 11c9406
commit 4af9024
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/infinitas/management/controllers/modules_controller.php b/infinitas/management/controllers/modules_controller.php
@@ -26,8 +26,8 @@ function admin_add() {
 
 			$positions = $this->Module->Position->find('list');
 			$groups = $this->Module->Group->find('list');
-			$modulesRoute = $this->Module->ModulesRoute->find('all');
-			$this->set(compact('positions', 'groups', 'modulesRoute'));
+			$routes = $this->Module->Route->find('all');
+			$this->set(compact('positions', 'groups', 'routes'));
 		}
 
 		function admin_edit($id = null) {

diff --git a/infinitas/management/models/module.php b/infinitas/management/models/module.php
@@ -26,11 +26,11 @@ class Module extends ManagementAppModel{
 		);
 
 		var $hasAndBelongsToMany = array(
-			'ModulesRoute' => array(
+			'Route' => array(
 				'className' => 'Core.ModulesRoute',
 				'joinTable' => 'modules_routes',
 				'foreignKey' => 'module_id',
-				'associationForeignKey' => 'routes_id',
+				'associationForeignKey' => 'route_id',
 				'unique' => true
 			)
 		);

diff --git a/infinitas/management/models/route.php b/infinitas/management/models/route.php
@@ -44,7 +44,7 @@ class Route extends ManagementAppModel {
 			'ModulesRoute' => array(
 				'className' => 'Core.ModulesRoute',
 				'joinTable' => 'modules_routes',
-				'foreignKey' => 'routes_id',
+				'foreignKey' => 'route_id',
 				'associationForeignKey' => 'module_id',
 				'unique' => true
 			)

diff --git a/infinitas/management/views/modules/admin_add.ctp b/infinitas/management/views/modules/admin_add.ctp
@@ -40,8 +40,7 @@
 		</div>
 		<div style="width:50%; float:left;">
 			<?php
-				pr($modulesRoute);
-				echo $this->Form->input( 'ModulesRoute' );
+				echo $this->Form->input( 'Route' );
 			?>
 		</div>
 	<?php