summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/static/media/style.css6
-rw-r--r--ishtar_common/urls.py2
-rw-r--r--ishtar_common/views.py6
-rw-r--r--ishtar_common/wizards.py5
4 files changed, 13 insertions, 6 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 1d3aed63f..8b05603df 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -723,7 +723,7 @@ table.confirm tr.spacer td:last-child{
margin:0.3em;
}
-#window p.alert{
+p.alert{
color:#D14;
display:block;
font-style:italic;
@@ -739,6 +739,10 @@ table.confirm tr.spacer td:last-child{
background-position:left center;
}
+#window p.alert{
+ background-color:#EEE;
+}
+
#window p.alert label{
width:650px;
}
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 61e030ef9..94e50d161 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -67,7 +67,7 @@ urlpatterns += patterns('ishtar_common.views',
name='update-current-item'),
url(r'new-person/(?P<parent_name>.+)?/$',
'new_person', name='new-person'),
- url(r'autocomplete-person/([0-9_]+)?$', 'autocomplete_person',
+ url(r'autocomplete-person(?:/([0-9_]+))?/(user)?$', 'autocomplete_person',
name='autocomplete-person'),
url(r'get-person/(?P<type>.+)?$', 'get_person',
name='get-person'),
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 4fc56f862..8fbf41759 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -134,7 +134,7 @@ def check_permission(request, action_slug, obj_id=None):
return menu.items[action_slug].is_available(request.user, obj_id)
return menu.items[action_slug].can_be_available(request.user)
-def autocomplete_person(request, person_types=None):
+def autocomplete_person(request, person_types=None, is_ishtar_user=None):
if not request.user.has_perm('ishtar_common.view_person', models.Person) and \
not request.user.has_perm('ishtar_common.view_own_person', models.Person) \
and not request.user.ishtaruser.has_right('person_search'):
@@ -151,13 +151,15 @@ def autocomplete_person(request, person_types=None):
for q in q.split(' '):
query = query & (Q(name__icontains=q) | Q(surname__icontains=q) | \
Q(email__icontains=q) | Q(attached_to__name__icontains=q))
- if person_types:
+ if person_types and unicode(person_types) != '0':
try:
typs = [int(tp) for tp in person_types.split('_') if tp]
typ = models.PersonType.objects.filter(pk__in=typs).all()
query = query & Q(person_types__in=typ)
except (ValueError, ObjectDoesNotExist):
pass
+ if is_ishtar_user:
+ query = query & Q(ishtaruser__isnull=False)
limit = 20
persons = models.Person.objects.filter(query)[:limit]
data = json.dumps([{'id':person.pk, 'value':unicode(person)}
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index 006c2554e..368c6e627 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -27,6 +27,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.core.files.images import ImageFile
from django.db.models.fields.files import FileField
from django.db.models.fields.related import ManyToManyField
+from django.forms import ValidationError
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.utils.datastructures import MultiValueDict as BaseMultiValueDict
@@ -376,7 +377,7 @@ class Wizard(NamedUrlWizardView):
setattr(obj, k, dct[k])
try:
obj.full_clean()
- except forms.ValidationError, msg:
+ except ValidationError, msg:
return self.render(form_list[-1])
for dependant_item in other_objs:
c_item = getattr(obj, dependant_item)
@@ -417,7 +418,7 @@ class Wizard(NamedUrlWizardView):
obj = self.get_saved_model()(**dct)
try:
obj.full_clean()
- except forms.ValidationError, msg:
+ except ValidationError, msg:
return self.render(form_list[-1])
obj.save()
for k in adds: