From e7c1d97be98f54bf6613dcb6059bd56c0fd25c16 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandro.alonso@kaleidos.net>
Date: Mon, 11 Aug 2014 14:23:25 +0200
Subject: [PATCH] Fixing membership creation

---
 app/coffee/modules/admin/lightboxes.coffee | 14 +++++++-------
 app/partials/issues-detail-edit.jade       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee
index a98dcf13..2386e66c 100644
--- a/app/coffee/modules/admin/lightboxes.coffee
+++ b/app/coffee/modules/admin/lightboxes.coffee
@@ -33,7 +33,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
     template = _.template("""
     <div class="add-member-wrapper">
         <fieldset>
-            <input type="email" placeholder="Type an Email" data-required="true" />
+            <input type="email" placeholder="Type an Email" data-required="true" data-type="email"/>
         </fieldset>
         <fieldset>
             <select data-required="true">
@@ -52,7 +52,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
             return template(ctx)
 
         resetForm = ->
-            $el.find("form > fieldset").remove()
+            $el.find("form > .add-member-wrapper").remove()
 
             title = $el.find("h2")
             fieldSet = createFieldSet()
@@ -109,13 +109,13 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
             if not form.validate()
                 return
 
-            fieldSets = $el.find("form > fieldset")
+            memberWrappers = $el.find("form > .add-member-wrapper")
 
-            invitations = _.map fieldSets, (fs) ->
-                fieldset = angular.element(fs)
+            invitations = _.map memberWrappers, (mw) ->
+                memberWrapper = angular.element(mw)
                 return {
-                    email: fieldset.children("input").val()
-                    role_id: fieldset.children("select").val()
+                    email: memberWrapper.find("input").val()
+                    role_id: memberWrapper.find("select").val()
                 }
 
             $rs.memberships.bulkCreateMemberships($scope.project.id, invitations).then(onSuccess, onError)
diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade
index 224099ee..a5f10f24 100644
--- a/app/partials/issues-detail-edit.jade
+++ b/app/partials/issues-detail-edit.jade
@@ -10,7 +10,7 @@ block content
             div.us-detail-header
                 include views/components/mainTitle
                 a.button.button-green.save-issue(href="", title="Save") Save
-                a.button.button-red.cancel(tg-nav="project-issues-detail:project=project.slug,ref=issue.ref", href="", title="Cancel") Cancel
+                a.button.button-red.cancel(tg-nav="project-issues-detail:project=project.slug, ref=issue.ref", href="", title="Cancel") Cancel
 
             section.us-story-main-data
                 div.us-title(ng-class="{blocked: issue.is_blocked}")