Merge lp:~jakedahn/horizon/lp732493 into lp:~hudson-openstack/horizon/trunk

[Jake Dahn]

This branch adds the ability to modify the project manager of any given project from the django-admin interface.

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'django-nova/src/django_nova/adminclient.py'
--- django-nova/src/django_nova/adminclient.py	2011-03-03 01:20:17 +0000
+++ django-nova/src/django_nova/adminclient.py	2011-03-10 11:04:08 +0000
@@ -466,6 +466,13 @@
                   'Operation': operation}
         return self.apiconn.get_status('ModifyProjectMember', params)
 
+    def modify_project(self, projectname, manager_user=None, description=None):
+        """Modifies an existing project."""
+        params = {'Name': projectname,
+                  'ManagerUser': manager_user,
+                  'Description': description}
+        return self.apiconn.get_status('ModifyProject', params)
+
     def get_zip(self, user, project):
         """
         Returns the content of a zip file containing novarc and access credentials.

=== modified file 'django-nova/src/django_nova/templates/admin/django_nova/project/edit_project.html'
--- django-nova/src/django_nova/templates/admin/django_nova/project/edit_project.html	2011-03-03 01:20:17 +0000
+++ django-nova/src/django_nova/templates/admin/django_nova/project/edit_project.html	2011-03-10 11:04:08 +0000
@@ -26,7 +26,8 @@
 <div id="content-main">
     {% block object-tools %}
     {% endblock %}
-    <form action="#" method="post" enctype="multipart/form-data">
+    
+    <form action="." method="post" enctype="multipart/form-data">
         {% csrf_token %}
         <fieldset class="module aligned {{ fieldset.classes }}">
             {% for field in form.visible_fields %}
@@ -39,24 +40,12 @@
             {% for field in form.hidden_fields %}
             {{ field }}
             {% endfor %}
-            <div class="form-row">
-              <label for="project_name">Project Name</label>
-              <span id="project_name" style="display: block; padding-top: 5px; padding-left: 5px; float: left;"><em>{{projectname}}</em></span>
-            </div>
-            <div class="form-row">
-              <label for="project_description">Description</label>
-              <span id="project_description" style="display: block; padding-top: 5px; padding-left: 5px; float: left;"><em>{{description}}</em></span>
-            </div>
-            <div class="form-row">
-              <label for="project_manager">Project Manager</label>
-              <span id="project_manager" style="display: block; padding-top: 5px; padding-left: 5px; float: left;"><em>{{manager}}</em></span>
-            </div>
         </fieldset>
         <div class="submit-row">
           <p class="deletelink-box">
             <a href="{% url delete_project project.projectname %}" class="deletelink">Delete Project</a>
           </p>
-          {# <input type="submit" value="Save" class="default" /> #}
+          <input type="submit" value="Save" class="default" />
         </div>
 
     </form>

=== modified file 'django-nova/src/django_nova/views/admin.py'
--- django-nova/src/django_nova/views/admin.py	2011-03-03 01:20:17 +0000
+++ django-nova/src/django_nova/views/admin.py	2011-03-10 11:04:08 +0000
@@ -107,10 +107,35 @@
     nova = get_nova_admin_connection()
     project = nova.get_project(project_name)
     users = nova.get_project_members(project_name)
+    
     try:
         manager = auth_models.User.objects.get(username=project.projectManagerId)
     except auth_models.User.DoesNotExist:
         manager = None
+    
+    if request.method == 'POST':
+        form = forms.ProjectForm(request.POST)
+        if form.is_valid():
+            try:
+                nova.modify_project(form.cleaned_data["projectname"],
+                                    form.cleaned_data["manager"],
+                                    form.cleaned_data["description"])
+                messages.success(request,
+                                 'Successfully modified the project %s.' %
+                                 project_name)
+            except boto.exception.EC2ResponseError, e:
+                messages.error(request,
+                               'Unable modify the project %s: %s - %s' %
+                               (project_name, e.code, e.error_message))
+            
+                                
+            return redirect('admin_project', request.POST["projectname"])
+    else:
+        form = forms.ProjectForm(initial={'projectname': project.projectname,
+                                          'description': project.description,
+                                          'manager': manager
+                                         })
+
 
     for user in users:
         project_role = [str(role.role) for role in nova.get_user_roles(user.memberId, project_name)]
@@ -122,9 +147,7 @@
     return render_to_response('admin/django_nova/project/edit_project.html', {
         'project' : project,
         'users' : users,
-        'projectname': project.projectname,
-        'manager': manager,
-        'description': project.description,
+        'form': form,
     }, context_instance = template.RequestContext(request))