diff options
| author | nishanth | 2010-02-24 14:47:29 +0530 |
|---|---|---|
| committer | nishanth | 2010-02-24 14:47:29 +0530 |
| commit | 15920b70d0753433a4faa058af1ac3797e7dd5f1 (patch) | |
| tree | 3a3872d44017064669a6afe7e90767245e9124b9 | |
| parent | 0a5d8db468dd357ae10a86cb84345c67e7d182b6 (diff) | |
| download | pytask-15920b70d0753433a4faa058af1ac3797e7dd5f1.tar.gz pytask-15920b70d0753433a4faa058af1ac3797e7dd5f1.tar.bz2 pytask-15920b70d0753433a4faa058af1ac3797e7dd5f1.zip | |
added user context variable in view_profile and edit_profile.
| -rw-r--r-- | taskapp/views/user.py | 6 | ||||
| -rw-r--r-- | templates/task/view.html | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/taskapp/views/user.py b/taskapp/views/user.py index 7fa86be..3ec7abd 100644 --- a/taskapp/views/user.py +++ b/taskapp/views/user.py @@ -54,13 +54,13 @@ def view_my_profile(request,uid=None): if uid == None: edit_profile = True profile = Profile.objects.get(user = request.user) - return render_to_response('user/my_profile.html', {'edit_profile':edit_profile,'profile':profile}) + return render_to_response('user/my_profile.html', {'edit_profile':edit_profile,'profile':profile, 'user':request.user}) edit_profile = True if request.user == User.objects.get(pk=uid) else False try: profile = Profile.objects.get(user = User.objects.get(pk=uid)) except Profile.DoesNotExist: raise Http404 - return render_to_response('user/my_profile.html', {'edit_profile':edit_profile,'profile':profile}) + return render_to_response('user/my_profile.html', {'edit_profile':edit_profile,'profile':profile, 'user':request.user}) @login_required def edit_my_profile(request): @@ -93,5 +93,5 @@ def edit_my_profile(request): else: profile = Profile.objects.get(user = request.user) edit_profile_form = UserProfileEditForm(instance = profile) - return render_to_response('user/edit_profile.html',{'edit_profile_form' : edit_profile_form}) + return render_to_response('user/edit_profile.html',{'edit_profile_form' : edit_profile_form, 'user':request.user}) diff --git a/templates/task/view.html b/templates/task/view.html index 7e03cb1..18c04c2 100644 --- a/templates/task/view.html +++ b/templates/task/view.html @@ -23,8 +23,8 @@ <a href="/task/view/tid={{dep.id}}">{{dep.title}}</a><br /> {% endfor %} {% if can_mod_tasks %} - <a href="/task/addtask/tid={{task.id}}">add more tasks</a> - <a href="/task/remtask/tid={{task.id}}">remove an existing task</a> + <a href="/task/addtask/tid={{task.id}}">add more dependencies</a> + <a href="/task/remtask/tid={{task.id}}">remove an existing dependency</a> {% endif %} {% else %} {%if can_mod_tasks %} |