From 4af90244044a5acd9a948022613a5a693bd22980 Mon Sep 17 00:00:00 2001
From: dogmatic <dogmatic69@gmail.com>
Date: Mon, 18 Jan 2010 23:41:54 +0200
Subject: [PATCH] fixing relations

---
 infinitas/management/controllers/modules_controller.php | 4 ++--
 infinitas/management/models/module.php                  | 4 ++--
 infinitas/management/models/route.php                   | 2 +-
 infinitas/management/views/modules/admin_add.ctp        | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/infinitas/management/controllers/modules_controller.php b/infinitas/management/controllers/modules_controller.php
index 7a574d296..ca283a305 100644
--- 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
index b5be045f8..7072e1a08 100644
--- 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
index 3a9d61fa0..2fe17088a 100644
--- 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
index 105f0e36a..82ede58c3 100644
--- 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