fnp
/
prawokultury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add privacy link
[prawokultury.git]
/
menu
/
helpers.py
diff --git
a/menu/helpers.py
b/menu/helpers.py
index
e94cbd8
..
33e90b7
100755
(executable)
--- a/
menu/helpers.py
+++ b/
menu/helpers.py
@@
-1,18
+1,32
@@
class MenuItem(object):
html_id = None
class MenuItem(object):
html_id = None
+ class InvalidMenuItem(BaseException):
+ pass
+
def __init__(self, url, title, html_id=None, more_urls=None):
self.url = url
self.title = title
self.html_id = html_id
self.more_urls = more_urls or set()
def __init__(self, url, title, html_id=None, more_urls=None):
self.url = url
self.title = title
self.html_id = html_id
self.more_urls = more_urls or set()
+ def is_valid(self):
+ return True
+
def is_active(self, request, value):
url = request.get_full_path()
def is_active(self, request, value):
url = request.get_full_path()
- return url == str(self.url) or url in set(str(url) for url in self.more_urls)
+ if url.startswith(str(self.url)):
+ return True
+ for other_url in self.more_urls:
+ if url.startswith(str(other_url)):
+ return True
+ return False
def check_active(self, request, value):
def check_active(self, request, value):
- self.active = self.is_active(request, value)
+ try:
+ self.active = self.is_active(request, value)
+ except self.InvalidMenuItem, e:
+ pass
def get_url(self):
return self.url
def get_url(self):
return self.url
@@
-27,25
+41,40
@@
class ObjectMenuItem(MenuItem):
If no url or title is provided, get_absolute_url and __unicode__ are used.
You can also provide a reverse lookup dictionary, as in {model: field_name}.
"""
If no url or title is provided, get_absolute_url and __unicode__ are used.
You can also provide a reverse lookup dictionary, as in {model: field_name}.
"""
- def __init__(self, obj, url=None, rev_lookups=None, title=None, html_id=None):
+ def __init__(self,
+ obj=None, obj_get=None,
+ url=None, rev_lookups=None, title=None, html_id=None):
super(ObjectMenuItem, self).__init__(url=url, title=title, html_id=html_id)
self.obj = obj
super(ObjectMenuItem, self).__init__(url=url, title=title, html_id=html_id)
self.obj = obj
+ self.obj_get = obj_get
self.rev_lookups = rev_lookups
self.rev_lookups = rev_lookups
+ def get_object(self):
+ try:
+ return self.obj or self.obj_get()
+ except BaseException, e:
+ raise self.InvalidMenuItem(e)
+
def get_title(self):
def get_title(self):
- return self.title or unicode(self.
obj
)
+ return self.title or unicode(self.
get_object()
)
- @property
def get_url(self):
def get_url(self):
- return self.url or self.obj.get_absolute_url()
+ return self.url or self.get_object().get_absolute_url()
+
+ def is_valid(self):
+ try:
+ obj = self.get_object()
+ except self.InvalidMenuItem, e:
+ return False
+ return True
def is_active(self, request, value):
def is_active(self, request, value):
- if value == self.
obj
:
+ if value == self.
get_object()
:
return True
if self.rev_lookups:
for model, manager in self.rev_lookups.items():
if (isinstance(value, model) and
return True
if self.rev_lookups:
for model, manager in self.rev_lookups.items():
if (isinstance(value, model) and
- self.
obj
in getattr(value, manager).all()):
+ self.
get_object()
in getattr(value, manager).all()):
return True
return False
return True
return False