From 1f6adf8478e5b9b553284262f07dc577fcfd12dc Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Mon, 15 Dec 2014 16:12:43 -0800 Subject: [PATCH] fix one half of ManyToMany relations stored in wrong obj --- planetstack/apigen/modelgen | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) mode change 100755 => 100644 planetstack/apigen/modelgen diff --git a/planetstack/apigen/modelgen b/planetstack/apigen/modelgen old mode 100755 new mode 100644 index 8a647b1..77d1e67 --- a/planetstack/apigen/modelgen +++ b/planetstack/apigen/modelgen @@ -111,8 +111,6 @@ class Generator(dict): cobj = copy.deepcopy(obj) cobj.multi = True cobj.plural_name = related_name - #if (str(refobj)=='slice' and related_name=='networks'): - # pdb.set_trace() refobj.refs.append(cobj) else: obj.props.append(f.name) @@ -126,7 +124,7 @@ class Generator(dict): related_name = f.related_query_name() if related_model_name in self.keys(): - # pdb.set_trace() + #print "XXX1", obj, f, related_name, related_model_name refobj = self[related_model_name] cobj = copy.deepcopy(obj) cobj.multi=True @@ -137,17 +135,12 @@ class Generator(dict): continue if (related_name!='+' and related_name.lower()!=str(obj).lower()): - cobj = copy.deepcopy(obj) + #print "XXX2", obj, f, related_name, related_model_name, refobj.plural_name + refobj = self[related_model_name] + cobj = copy.deepcopy(refobj) cobj.multi = True - cobj.plural_name = related_name - - #if (str(refobj)=='slice' and related_name=='networks'): - # pdb.set_trace() - refobj.refs.append(cobj) - #if (related_name=='networks'): - #pdb.set_trace() - #print str(refobj) + obj.refs.append(cobj) -- 2.43.0