diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-02-22 14:51:40 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-02-22 14:51:40 +0100 |
| commit | 3590b6d57da21772bc03657058b5f973e7cd0863 (patch) | |
| tree | c6674d213db58423d7b77bcb46f6d20f399e09e4 | |
| parent | d91761250f08760375278b4a91d9ab3904e2d089 (diff) | |
the a bit
| -rw-r--r-- | coip/apps/name/views.py | 4 | ||||
| -rw-r--r-- | coip/extensions/templatetags/permdisplay.py | 5 | ||||
| -rw-r--r-- | coip/multiresponse.py | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py index dba73c2..01b2652 100644 --- a/coip/apps/name/views.py +++ b/coip/apps/name/views.py @@ -67,7 +67,7 @@ def add(request,id): else: form = NewNameForm() - return respond_to(request,{'text/html': 'apps/name/edit.html'},{'form': form,'name': parent,'formtitle': 'Create new name','submitname': 'Create'}) + return respond_to(request,{'text/html': 'apps/name/edit.html'},{'form': form,'name': parent,'formtitle': 'Add group','submitname': 'Create'}) @login_required def edit(request,id): @@ -91,7 +91,7 @@ def edit(request,id): def editacl(request,id,type): name = get_object_or_404(Name,pk=id) - if not name.has_permission(request.user,'w'): + if not name.has_permission(request.user,'a'): return render403("You do not have permission to change permissions on %s" % (name)) if request.method == 'POST': diff --git a/coip/extensions/templatetags/permdisplay.py b/coip/extensions/templatetags/permdisplay.py index 364544e..23e6ed3 100644 --- a/coip/extensions/templatetags/permdisplay.py +++ b/coip/extensions/templatetags/permdisplay.py @@ -12,7 +12,8 @@ perms = {'r':'read', 'w':'write', 'd':'delete', 'i':'manage members', - 'l':'list members'} + 'l':'list members', + 'a':'manage rights'} def permdisplay(perm): if perm: @@ -32,7 +33,7 @@ def acldstdisplay(dst): else: return "Unknown user \"%s\"" % username else: - return "Members of <a tip=\"%s\" href=\"/name/%d\">%s</a>" % (dst.display,dst.id,dst.short) + return "Members of <a class=\"tip\" title=\"%s\" href=\"/name/id/%d\">%s</a>" % (dst.display,dst.id,dst.short) acldstdisplay.is_safe = True diff --git a/coip/multiresponse.py b/coip/multiresponse.py index 3831a21..2376fab 100644 --- a/coip/multiresponse.py +++ b/coip/multiresponse.py @@ -34,9 +34,10 @@ def make_response_dict(request,d={}): name = d['name'] if name: d['render'] = {'delete': name.has_permission(request.user,'d'), - 'insert': name.has_permission(request.user,'w'), 'edit': name.has_permission(request.user,'w'), 'invite': name.has_permission(request.user,'i'), + 'acl': name.has_permission(request.user,'a'), + 'add': name.has_permission(request.user,'w'), 'up': (name.parent and name.parent.has_permission(request.user,'r')) or not name.parent} return d |