Merge lp:~xtoddx/django-nova/adduser into lp:django-nova

[Todd Willey]

Allows adding users to projects from the project management page.

[Devin Carlen (devcamcar)]

This is a little tricky. I don't think we can allow NASA users to add the users themselves.

Can you add a setting for enabling and disabling this? It can be enabled by default.

review: Needs Fixing

[Devin Carlen (devcamcar)]

I am in the process of combining the openstack-dashboard and django-nova repos. This is almost done. Pleas resubmit this patch against lp:openstack-dashboard in the django-nova folder when that is ready.

review: Needs Resubmitting

Unmerged revisions

20. By Todd Willey on 2011-03-02

Add users to projects!

=== modified file 'src/django_nova/forms.py'
--- src/django_nova/forms.py	2011-01-21 22:38:42 +0000
+++ src/django_nova/forms.py	2011-03-02 06:29:56 +0000
@@ -260,3 +260,15 @@
 
         self.fields['users'].choices = [(choices, choices) for choices in query_list]
 
+class InviteUserForm(forms.Form):
+    username = forms.CharField(required=True, label="Username")
+
+    def is_valid(self):
+        super(InviteUserForm, self).is_valid()
+        if not self.errors:
+            nova = get_nova_admin_connection()
+            user = nova.get_user(self.cleaned_data['username'])
+            if not user:
+                self.errors['username'] = self.error_class()
+                self.errors['username'].append("Invalid user")
+        return not self.errors

=== modified file 'src/django_nova/templates/django_nova/projects/manage.html'
--- src/django_nova/templates/django_nova/projects/manage.html	2011-01-12 20:02:06 +0000
+++ src/django_nova/templates/django_nova/projects/manage.html	2011-03-02 06:29:56 +0000
@@ -41,5 +41,21 @@
     </div>
     {% endif %}
   </div>
+
+  <div id="invite_user">
+		<form id="invite_user_form" method="post" action="{% url nova_project_manage project.projectname %}">
+      {% csrf_token %}
+      <fieldset>
+        {% for field in invite_form %}
+          {{ field.label_tag }}
+					{% if field.errors %}
+						{{ field.errors }}
+					{% endif %}
+          {{ field }}
+        {% endfor %}
+      </fieldset>
+      <input type="submit" value="Add to Project"/>
+    </form>
+  </div>
+
 {% endblock %}
-

=== modified file 'src/django_nova/views/projects.py'
--- src/django_nova/views/projects.py	2011-01-31 20:08:02 +0000
+++ src/django_nova/views/projects.py	2011-03-02 06:29:56 +0000
@@ -51,6 +51,17 @@
         return redirect('login')
 
     nova = get_nova_admin_connection()
+
+    if request.method == 'POST':
+        invite_form = nova_forms.InviteUserForm(request.POST)
+        if invite_form.is_valid():
+            updated = nova.add_project_member(
+                          invite_form.cleaned_data['username'], project_id)
+            if updated:
+                return redirect('nova_project_manage',  project_id)
+    else:
+        invite_form = nova_forms.InviteUserForm()
+
     members = nova.get_project_members(project_id)
 
     for member in members:
@@ -60,10 +71,10 @@
         member.project_roles = ", ".join(project_role)
         member.global_roles = ", ".join(global_role)
 
-
     return render_to_response('django_nova/projects/manage.html', {
         'project': project,
         'members': members,
+        'invite_form': invite_form
     }, context_instance = template.RequestContext(request))