diff options
| -rw-r--r-- | ishtar_common/models.py | 1 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 21 |
2 files changed, 9 insertions, 13 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e4f13ab5f..096a5e0a7 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -192,6 +192,7 @@ __all__ = [ "Document", "GeneralType", "get_generated_id", + "get_current_profile", "LightHistorizedItem", "OwnPerms", "Address", diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 615abd0ec..d4f0c339d 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -26,7 +26,6 @@ from django.db.models import ( Count, Sum, ImageField, - Func, ExpressionWrapper, FloatField, FileField, @@ -155,16 +154,16 @@ def get_autocomplete_item(model, extra=None): def check_permission(request, action_slug, obj_id=None): - MAIN_MENU = Menu(request.user) - MAIN_MENU.init() - if action_slug not in MAIN_MENU.items: + main_menu = Menu(request.user) + main_menu.init() + if action_slug not in main_menu.items: # TODO return True if obj_id: - return MAIN_MENU.items[action_slug].is_available( + return main_menu.items[action_slug].is_available( request.user, obj_id, session=request.session ) - return MAIN_MENU.items[action_slug].can_be_available( + return main_menu.items[action_slug].can_be_available( request.user, session=request.session ) @@ -640,7 +639,7 @@ def _parse_query_string( match = RE_FACET.search(string) if match or "=" in string: - queries = [] + base_term, queries = "", [] if match: for idx, gp in enumerate(match.groups()): if not idx: @@ -930,7 +929,7 @@ def _manage_dated_fields(dated_fields, dct): for today in TODAYS: if value.startswith(today): base_date = datetime.date.today() - value = value[len(today) :].replace(" ", "") + value = value[len(today):].replace(" ", "") if value and value[0] in ("-", "+"): sign = value[0] try: @@ -1205,6 +1204,7 @@ def _manage_relation_types(relation_types, dct, query, or_reqs): if not vals: continue vals = list(vals)[0].split(";") + alt_dct = {} for v in vals: alt_dct = { rtype_prefix @@ -1225,11 +1225,6 @@ def _manage_relation_types(relation_types, dct, query, or_reqs): if k.endswith("year"): k += "__exact" alt_dct[rtype_prefix + "right_relations__right_record__" + k] = val - # TODO: AFAC - #if not dct: - # fake condition to trick Django (1.4): without it only the - # alt_dct is managed - # query &= Q(pk__isnull=False) query |= Q(**alt_dct) for k, or_req in or_reqs: altor_dct = alt_dct.copy() |