@@ -1,7 +1,9 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from newprojects.models import Project +from django.contrib.auth.models import User + +from newprojects.models import Project, ProjectMember # @@@ we should have auto slugs, even if suggested and overrideable @@ -41,3 +43,33 @@ class ProjectUpdateForm(forms.ModelForm): class Meta: model = Project fields = ('name', 'description') + + +class AddUserForm(forms.Form): + + recipient = forms.CharField(label=_(u"User")) + + def __init__(self, *args, **kwargs): + self.project = kwargs.pop("project") + super(AddUserForm, self).__init__(*args, **kwargs) + + def clean_recipient(self): + try: + user = User.objects.get(username__exact=self.cleaned_data['recipient']) + except User.DoesNotExist: + raise forms.ValidationError(_("There is no user with this username.")) + + if ProjectMember.objects.filter(project=self.project, user=user).count() > 0: + raise forms.ValidationError(_("User is already a member of this project.")) + + return self.cleaned_data['recipient'] + + def save(self, user): + new_member = User.objects.get(username__exact=self.cleaned_data['recipient']) + project_member = ProjectMember(project=self.project, user=new_member) + project_member.save() + self.project.members.add(project_member) + #if notification: + # notification.send(self.project.member_users.all(), "projects_new_member", {"new_member": new_member, "project": self.project}) + # notification.send([new_member], "projects_added_as_member", {"adder": user, "project": self.project}) + user.message_set.create(message="added %s to project" % new_member) pinax/apps/newprojects/forms.py @@ -16,7 +16,7 @@ else: notification = None from newprojects.models import Project, ProjectMember -from newprojects.forms import ProjectForm, ProjectUpdateForm +from newprojects.forms import ProjectForm, ProjectUpdateForm, AddUserForm TOPIC_COUNT_SQL = """ SELECT COUNT(*) @@ -97,45 +97,37 @@ def your_projects(request, template_name="newprojects/your_projects.html"): }, context_instance=RequestContext(request)) -def project(request, group_slug=None, form_class=ProjectUpdateForm, +def project(request, group_slug=None, form_class=ProjectUpdateForm, adduser_form_class=AddUserForm, template_name="newprojects/project.html"): project = get_object_or_404(Project, slug=group_slug) - project_form = form_class(request.POST or None, instance=project) - if not request.user.is_authenticated(): is_member = False else: is_member = project.user_is_member(request.user) - action = request.POST.get('action') - if action == 'update' and project_form.is_valid(): - project = project_form.save() - elif action == 'join': - # @@@ should move to a method on the Project model? - if not is_member: - project_member = ProjectMember(project=project, user=request.user) - project.members.add(project_member) - project_member.save() - request.user.message_set.create( - message=_("You have joined the project %(project_name)s") % {"project_name": project.name}) - if notification: - notification.send([project.creator], "projects_created_new_member", {"user": request.user, "project": project}) - notification.send(project.member_users.all(), "projects_new_member", {"user": request.user, "project": project}) - else: - request.user.message_set.create( - message=_("You are already a member of project %(project_name)s") % {"project_name": project.name}) - elif action == 'leave': - project.members.remove(request.user) - request.user.message_set.create(message="You have left the project %(project_name)s" % {"project_name": project.name}) - if notification: - pass # @@@ no notification on departure yet + action = request.POST.get("action") + if request.user == project.creator and action == "update": + project_form = form_class(request.POST, instance=project) + if project_form.is_valid(): + project = project_form.save() + else: + project_form = form_class(instance=project) + if request.user == project.creator and action == "add": + adduser_form = adduser_form_class(request.POST, project=project) + if adduser_form.is_valid(): + adduser_form.save(request.user) + adduser_form = adduser_form_class(project=project) # clear form + else: + adduser_form = adduser_form_class(project=project) # TODO: Shouldn't have to do this in the view. Should write new "groupurl" templatetag :( new_topic_url = reverse('topic_list', kwargs=project.get_url_kwargs()) + print project_form._errors return render_to_response(template_name, { "project_form": project_form, + "adduser_form": adduser_form, "project": project, "is_member": is_member, "new_topic_url": new_topic_url, pinax/apps/newprojects/views.py @@ -64,40 +64,41 @@ </form> </div> - {% ifequal project.members.all.count 1 %} - <p><img src="{{ MEDIA_URL }}pinax/images/silk/icons/delete.png" /> <a href="#" onclick="$('#delete_project_form').toggle(); return false;">{% trans "Delete project" %}</a><p> - <form class="delete_form" id="delete_project_form" action="{% url project_delete project.slug %}" method="POST" style="display: none;"> - <input type="submit" value="{% trans "Delete Project" %}" /> (all content will be removed) - </form> - {% else %} - <p>{% trans "You are not the only member of the project so you can't delete the project." %}</p> - {% endifequal %} - {% endifequal %} {% if user.is_authenticated %} <div> - <form method="POST" action=""> - {% if is_member %} - {% ifequal user project.creator %} - <p>{% trans "You are the creator of this project so can't leave (yet)." %}</p> - {% else %} - <input type="hidden" name="action" value="leave" /> - <input type="submit" value="{% trans "leave" %}"/> - {% endifequal %} + {% if is_member %} + {% ifequal user project.creator %} + <p>You are the creator of this project.</p> + + <div class="form-toggle"> + <p><span id="add-member-toggle">{% trans "Add new member" %}</a></p> + + <form class="uniForm" id="add-member" method="POST" action=""> + <fieldset class="inlineLabels"> + {{ adduser_form|as_uni_form }} + <div class="form_block"> + <input type="hidden" name="action" value="add" /> + <input type="submit" value="{% trans "add" %}"/> + </div> + </fieldset> + </form> + </div> + + <p><img src="{{ MEDIA_URL }}pinax/images/silk/icons/delete.png" /> <a href="#" onclick="$('#delete_project_form').toggle(); return false;">{% trans "Delete project" %}</a><p> + <form class="delete_form" id="delete_project_form" action="{% url project_delete project.slug %}" method="POST" style="display: none;"> + <input type="submit" value="{% trans "Delete Project" %}" /> (all content will be removed) + </form> {% else %} - <input type="hidden" name="action" value="join" /> - <input type="submit" value="{% trans "join project" %}"/> - {% endif %} - </form> + <p>You are member of this project.</p> + {% endifequal %} + {% else %} + <p>It is up to the creator of this project (<a href="{% url profile_detail project.creator.username %}">{{ project.creator }}</a>) to add you.</p> + {% endif %} </div> - {% else %} - {% url acct_signup as signup_url %} - {% url acct_login as login_url %} - <p>{% blocktrans %}<a href="{{ signup_url }}">Sign up</a> and <a href="{{ login_url }}">log in </a> to join this project.{% endblocktrans %}</p> {% endif %} - {% if user.is_authenticated %} <h2>{% trans "Discussion Topics" %}{% if project.topics.all.count %} ({{ project.topics.all.count }}){% endif %}</h2> @@ -163,6 +164,16 @@ $('#edit-project').show(); $('#edit-project .error').autoscroll(); } + $('#add-member').hide(); + $('#add-member-toggle').click(function() { + $('#add-member').toggle(); + $('#add-member').autoscroll(); + return false; + }); + if ($('#add-member .error').length) { + $('#add-member').show(); + $('#add-member .error').autoscroll(); + } }); </script> pinax/templates/default/newprojects/project.html b96644f9686e0aae6c0a8debb26ee8c03b7f1e62 James Tauber jtauber@jtauber.com http://github.com/pinax/pinax/commit/a1b6d301348981aafda5d514f7bccf839941fd5c a1b6d301348981aafda5d514f7bccf839941fd5c 2009-06-23T22:37:08-07:00 2009-06-23T22:37:08-07:00 changed newprojects to have same approach to membership as old projects and not just copied from newtribes 0f5dd9d7314636a06ddcf1e3a202e87e761f9882 James Tauber jtauber@jtauber.com