Author: jtauber
Date: Mon Sep 8 22:38:37 2008
New Revision: 858
Modified:
trunk/pinax/local_apps/projects/models.py
trunk/pinax/local_apps/projects/views.py
Log:
DRY: new method project.has_member(user)
Modified: trunk/pinax/local_apps/projects/models.py
==============================================================================
--- trunk/pinax/local_apps/projects/models.py (original)
+++ trunk/pinax/local_apps/projects/models.py Mon Sep 8 22:38:37 2008
@@ -44,6 +44,12 @@
def wiki_articles(self):
return get_articles_for_object(self)
+ def has_member(self, user):
+ if user.is_authenticated():
+ if ProjectMember.objects.filter(project=self,
user=user).count() > 0: # @@@ is there a better way?
+ return True
+ return False
+
def __unicode__(self):
return self.name
Modified: trunk/pinax/local_apps/projects/views.py
==============================================================================
--- trunk/pinax/local_apps/projects/views.py (original)
+++ trunk/pinax/local_apps/projects/views.py Mon Sep 8 22:38:37 2008
@@ -97,8 +97,8 @@
# tweets = TweetInstance.objects.tweets_for(project).order_by("-sent")
- are_member = project.member_users.filter(user=request.user).count() >
0 # @@@ should this be == 1
-
+ are_member = project.has_member(request.user)
+
return render_to_response("projects/project.html", {
"project_form": project_form,
"adduser_form": adduser_form,
@@ -114,7 +114,7 @@
def topics(request, slug):
project = get_object_or_404(Project, slug=slug)
- is_member = request.user.is_authenticated() and
project.member_users.filter(user=request.user).count() > 0
+ is_member = project.has_member(request.user)
if request.method == "POST":
if is_member:
@@ -150,7 +150,7 @@
def tasks(request, slug):
project = get_object_or_404(Project, slug=slug)
- is_member = request.user.is_authenticated() and
project.member_users.filter(user=request.user).count() > 0
+ is_member = project.has_member(request.user)
if request.user.is_authenticated() and request.method == "POST":
if request.POST["action"] == "add_task":
@@ -184,7 +184,7 @@
def task(request, id):
task = get_object_or_404(Task, id=id)
project = task.project
- is_member = request.user.is_authenticated() and
project.member_users.filter(user=request.user).count() > 0
+ is_member = project.has_member(request.user)
if is_member and request.method == "POST":
if request.POST["action"] == "assign":
@@ -249,7 +249,7 @@
def members_status(request, slug):
project = get_object_or_404(Project, slug=slug)
- is_member = project.member_users.filter(user=request.user).count() > 0
+ is_member = project.has_member(request.user)
try:
project_member = project.members.get(user=request.user)
except ProjectMember.DoesNotExist:
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
