taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing membership creation

stable
Alejandro Alonso 2014-08-11 14:23:25 +02:00
parent ad5ceca2e2
commit e7c1d97be9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/coffee/modules/admin/lightboxes.coffee
View File

@ -33,7 +33,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
template = _.template(""" template = _.template("""
<div class="add-member-wrapper"> <div class="add-member-wrapper">
<fieldset> <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>
<fieldset> <fieldset>
<select data-required="true"> <select data-required="true">
@ -52,7 +52,7 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
return template(ctx) return template(ctx)
resetForm = -> resetForm = ->
$el.find("form > fieldset").remove() $el.find("form > .add-member-wrapper").remove()
title = $el.find("h2") title = $el.find("h2")
fieldSet = createFieldSet() fieldSet = createFieldSet()
@ -109,13 +109,13 @@ CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
if not form.validate() if not form.validate()
return return
fieldSets = $el.find("form > fieldset") memberWrappers = $el.find("form > .add-member-wrapper")
invitations = _.map fieldSets, (fs) -> invitations = _.map memberWrappers, (mw) ->
fieldset = angular.element(fs) memberWrapper = angular.element(mw)
return { return {
email: fieldset.children("input").val() email: memberWrapper.find("input").val()
role_id: fieldset.children("select").val() role_id: memberWrapper.find("select").val()
} }
$rs.memberships.bulkCreateMemberships($scope.project.id, invitations).then(onSuccess, onError) $rs.memberships.bulkCreateMemberships($scope.project.id, invitations).then(onSuccess, onError)

2
app/partials/issues-detail-edit.jade
View File

@ -10,7 +10,7 @@ block content
div.us-detail-header div.us-detail-header
include views/components/mainTitle include views/components/mainTitle
a.button.button-green.save-issue(href="", title="Save") Save 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 section.us-story-main-data
div.us-title(ng-class="{blocked: issue.is_blocked}") div.us-title(ng-class="{blocked: issue.is_blocked}")