fix #671

2015-07-08 17:42:00 +03:00
parent a89f14d80d
commit 5612f61a93
2 changed files with 9 additions and 1 deletions
--- a/orm/models_boot.go
+++ b/orm/models_boot.go
@@ -269,7 +269,10 @@ func bootStrap() {
 				if found == false {
 				mForC:
 					for _, ffi := range fi.relModelInfo.fields.fieldsByType[RelManyToMany] {
-						if ffi.relModelInfo == mi {
+						conditions := fi.relThrough != "" && fi.relThrough == ffi.relThrough ||
+							fi.relTable != "" && fi.relTable == ffi.relTable ||
+							fi.relThrough == "" && fi.relTable == ""
+						if ffi.relModelInfo == mi && conditions {
 							found = true

 							fi.reverseField = ffi.reverseFieldInfoTwo.name