diff options
| -rw-r--r-- | ishtar_common/context_processors.py | 3 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 0dc907ffd..12e7bc9be 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -65,7 +65,8 @@ def get_base_context(request): if request.user.ishtaruser.has_right('administrator', session=request.session): dct['ADMIN'] = True - if request.user.ishtaruser.current_profile.display_pin_menu: + if request.user.ishtaruser.current_profile and \ + request.user.ishtaruser.current_profile.display_pin_menu: dct['DISPLAY_PIN_MENU'] = True if menu.selected_idx is not None: dct['current_theme'] = "theme-%d" % (menu.selected_idx + 1) diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index d0a7df84b..a439cc014 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -908,7 +908,8 @@ class Wizard(IshtarWizard): ishtaruser = self.request.user.ishtaruser \ if hasattr(self.request.user, 'ishtaruser') else None - if ishtaruser and ishtaruser.current_profile.auto_pin: + if ishtaruser and ishtaruser.current_profile \ + and ishtaruser.current_profile.auto_pin: # make the new object a default if self.current_obj_slug: self.request.session[self.current_obj_slug] = unicode(obj.pk) @@ -1389,7 +1390,8 @@ class Wizard(IshtarWizard): ishtaruser = self.request.user.ishtaruser \ if hasattr(self.request.user, 'ishtaruser') else None - if ishtaruser and ishtaruser.current_profile.auto_pin: + if ishtaruser and ishtaruser.current_profile \ + and ishtaruser.current_profile.auto_pin: # make the current object the default item for the session self.request.session[self.get_object_name(obj)] = unicode(obj.pk) |