diff options
Diffstat (limited to 'ishtar_common/utils.py')
| -rw-r--r-- | ishtar_common/utils.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 43603b2e1..388f54ff4 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -1092,7 +1092,7 @@ def create_default_areas(models=None, verbose=False): def get_relations_for_graph(rel_model, obj_pk, above_relations=None, equal_relations=None, treated=None, styles=None, - render_above=True, render_bellow=True, full=False): + render_above=True, render_below=True, full=False): """ Get all above and equal relations of an object (get all child and parent relations) @@ -1103,7 +1103,7 @@ def get_relations_for_graph(rel_model, obj_pk, above_relations=None, :param treated: treated relation list to prevent circular call :param styles: current styles :param render_above: render relation above the current object - :param render_bellow: render relation bellow the current object + :param render_below: render relation below the current object :param full: render the full graph :return: above and equal relations list (each containing lists of two members) @@ -1130,23 +1130,23 @@ def get_relations_for_graph(rel_model, obj_pk, above_relations=None, relation_type__logical_relation__isnull=False), True)): q = q.values("left_record_id",'right_record_id', 'relation_type__logical_relation') - get_above, get_bellow = render_above, render_bellow - if inverse and (not render_above or not render_bellow): - get_above, get_bellow = not render_above, not render_bellow + get_above, get_below = render_above, render_below + if inverse and (not render_above or not render_below): + get_above, get_below = not render_above, not render_below for relation in q.all(): logical_relation = relation['relation_type__logical_relation'] left_record = relation['left_record_id'] right_record = relation['right_record_id'] - is_above, is_bellow = False, False + is_above, is_below = False, False if not logical_relation: continue - elif get_bellow and logical_relation == 'above' and \ + elif get_below and logical_relation == 'above' and \ (left_record, right_record) not in above_relations: above_relations.append((left_record, right_record)) - is_bellow = True - elif get_above and logical_relation == 'bellow' and \ + is_below = True + elif get_above and logical_relation == 'below' and \ (right_record, left_record) not in above_relations: above_relations.append((right_record, left_record)) is_above = True @@ -1161,27 +1161,27 @@ def get_relations_for_graph(rel_model, obj_pk, above_relations=None, other_record = left_record else: other_record = right_record - if get_above and get_bellow and not full and (is_bellow or - is_above): - if (is_above and not inverse) or (is_bellow and inverse): + if get_above and get_below and not full and (is_below or + is_above): + if (is_above and not inverse) or (is_below and inverse): ar, er, substyles = get_relations_for_graph( rel_model, other_record, above_relations, equal_relations, treated, styles, render_above=True, - render_bellow=False + render_below=False ) else: ar, er, substyles = get_relations_for_graph( rel_model, other_record, above_relations, equal_relations, treated, styles, render_above=False, - render_bellow=True + render_below=True ) else: ar, er, substyles = get_relations_for_graph( rel_model, other_record, above_relations, equal_relations, treated, styles, render_above=render_above, - render_bellow=render_bellow, full=full + render_below=render_below, full=full ) styles.update(substyles) error_style = "color=red" @@ -1213,7 +1213,7 @@ def get_relations_for_graph(rel_model, obj_pk, above_relations=None, def generate_relation_graph(obj, highlight_current=True, - render_above=True, render_bellow=True, + render_above=True, render_below=True, full=False, debug=False): if not settings.DOT_BINARY: return @@ -1224,7 +1224,7 @@ def generate_relation_graph(obj, highlight_current=True, # get relations above_relations, equal_relations, styles = get_relations_for_graph( rel_model, obj.pk, render_above=render_above, - render_bellow=render_bellow, full=full) + render_below=render_below, full=full) # generate dotfile dot_str = "digraph relations {\nnode [shape=box];\n" @@ -1284,8 +1284,8 @@ def generate_relation_graph(obj, highlight_current=True, dot_file.write(dot_str) if not render_above: - suffix = "_bellow" - elif not render_bellow: + suffix = "_below" + elif not render_below: suffix = "_above" else: suffix = "" |