Removed the named table alias from each of the HABTM joins, since we don't know in advance what name will be used in the actual join

git-svn-id: file:///svn-source/pmgr/branches/initial_20090526/site@51 97e9348a-65ac-dc4b-aefc-98561f571b83

models/contact.php

@@ -31,7 +31,7 @@ class Contact extends AppModel {
 			'foreignKey' => 'contact_id',
 			'associationForeignKey' => 'method_id',
 			'unique' => true,
-			'conditions' => "ContactsMethod.method = 'POST'",
+			'conditions' => "method = 'POST'",
 			'fields' => '',
 			'order' => '',
 			'limit' => '',
@@ -46,7 +46,7 @@ class Contact extends AppModel {
 			'foreignKey' => 'contact_id',
 			'associationForeignKey' => 'method_id',
 			'unique' => true,
-			'conditions' => "ContactsMethod.method = 'PHONE'",
+			'conditions' => "method = 'PHONE'",
 			'fields' => '',
 			'order' => '',
 			'limit' => '',
@@ -61,7 +61,7 @@ class Contact extends AppModel {
 			'foreignKey' => 'contact_id',
 			'associationForeignKey' => 'method_id',
 			'unique' => true,
-			'conditions' => "ContactsMethod.method = 'EMAIL'",
+			'conditions' => "method = 'EMAIL'",
 			'fields' => '',
 			'order' => '',
 			'limit' => '',

models/contact_address.php

@@ -14,7 +14,7 @@ class ContactAddress extends AppModel {
 			'foreignKey' => 'method_id',
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
-			'conditions' => "ContactsMethod.method = 'POST'",
+			'conditions' => "method = 'POST'",
 			'fields' => '',
 			'order' => '',
 			'limit' => '',

models/contact_email.php

@@ -14,7 +14,7 @@ class ContactEmail extends AppModel {
 			'foreignKey' => 'method_id',
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
-			'conditions' => "ContactsMethod.method = 'EMAIL'",
+			'conditions' => "method = 'EMAIL'",
 			'fields' => '',
 			'order' => '',
 			'limit' => '',

models/contact_phone.php

@@ -16,7 +16,7 @@ class ContactPhone extends AppModel {
 			'foreignKey' => 'method_id',
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
-			'conditions' => "ContactsMethod.method = 'PHONE'",
+			'conditions' => "method = 'PHONE'",
 			'fields' => '',
 			'order' => '',
 			'limit' => '',