Added typeahead for templates and fixed groups not being submitted

I fixed the typeahead for templates. This should allow for campaigns to finally be sent successfully.
pull/64/head
Jordan Wright 2015-09-15 22:57:47 -05:00
parent 9a13eef518
commit e783017280
2 changed files with 49 additions and 35 deletions

View File

@ -9,6 +9,11 @@ var labels = {
// Save attempts to POST to /campaigns/ // Save attempts to POST to /campaigns/
function save(){ function save(){
groups = []
$.each($("#groupTable").DataTable().rows().data(), function(i, group){
groups.push({name: group[0]})
})
console.log(groups)
var campaign = { var campaign = {
name: $("#name").val(), name: $("#name").val(),
template:{ template:{
@ -20,13 +25,13 @@ function save(){
username: $("input[name=username]").val(), username: $("input[name=username]").val(),
password: $("input[name=password]").val(), password: $("input[name=password]").val(),
}, },
groups: [{name : "Test group"}] groups: groups
} }
// Submit the campaign // Submit the campaign
api.campaigns.post(campaign) api.campaigns.post(campaign)
.success(function(data){ .success(function(data){
successFlash("Campaign successfully launched!") successFlash("Campaign successfully launched!")
load() window.location = "/campaigns/" + campaign.id.toString()
}) })
.error(function(data){ .error(function(data){
$("#modal\\.flashes").empty().append("<div style=\"text-align:center\" class=\"alert alert-danger\">\ $("#modal\\.flashes").empty().append("<div style=\"text-align:center\" class=\"alert alert-danger\">\
@ -42,7 +47,8 @@ function dismiss(){
function edit(campaign){ function edit(campaign){
// Clear the bloodhound instance // Clear the bloodhound instance
bh.clear(); group_bh.clear();
template_bh.clear();
if (campaign == "new") { if (campaign == "new") {
api.groups.get() api.groups.get()
.success(function(groups){ .success(function(groups){
@ -51,9 +57,19 @@ function edit(campaign){
return false; return false;
} }
else { else {
bh.add(groups) group_bh.add(groups)
} }
}) })
api.templates.get()
.success(function(templates){
if (templates.length == 0){
modalError("No templates found!")
return false
}
else {
template_bh.add(templates)
}
})
} }
} }
@ -101,12 +117,12 @@ $(document).ready(function(){
// Create the group typeahead objects // Create the group typeahead objects
groupTable = $("#groupTable").DataTable() groupTable = $("#groupTable").DataTable()
suggestion_template = Hogan.compile('<div>{{name}}</div>') suggestion_template = Hogan.compile('<div>{{name}}</div>')
bh = new Bloodhound({ group_bh = new Bloodhound({
datumTokenizer: function(g) { return Bloodhound.tokenizers.whitespace(g.name) }, datumTokenizer: function(g) { return Bloodhound.tokenizers.whitespace(g.name) },
queryTokenizer: Bloodhound.tokenizers.whitespace, queryTokenizer: Bloodhound.tokenizers.whitespace,
local: [] local: []
}) })
bh.initialize() group_bh.initialize()
$("#groupSelect.typeahead.form-control").typeahead({ $("#groupSelect.typeahead.form-control").typeahead({
hint: true, hint: true,
highlight: true, highlight: true,
@ -114,7 +130,7 @@ $(document).ready(function(){
}, },
{ {
name: "groups", name: "groups",
source: bh, source: group_bh,
templates: { templates: {
empty: function(data) {return '<div class="tt-suggestion">No groups matched that query</div>' }, empty: function(data) {return '<div class="tt-suggestion">No groups matched that query</div>' },
suggestion: function(data){ return '<div>' + data.name + '</div>' } suggestion: function(data){ return '<div>' + data.name + '</div>' }
@ -123,4 +139,27 @@ $(document).ready(function(){
.bind('typeahead:select', function(ev, group){ .bind('typeahead:select', function(ev, group){
$("#groupSelect").typeahead('val', group.name) $("#groupSelect").typeahead('val', group.name)
}); });
// Create the template typeahead objects
template_bh = new Bloodhound({
datumTokenizer: function(t) { return Bloodhound.tokenizers.whitespace(t.name) },
queryTokenizer: Bloodhound.tokenizers.whitespace,
local: []
})
template_bh.initialize()
$("#template.typeahead.form-control").typeahead({
hint: true,
highlight: true,
minLength: 1
},
{
name: "templates",
source: template_bh,
templates: {
empty: function(data) {return '<div class="tt-suggestion">No templates matched that query</div>' },
suggestion: function(data){ return '<div>' + data.name + '</div>' }
}
})
.bind('typeahead:select', function(ev, template){
$("#template").typeahead('val', template.name)
})
}) })

View File

@ -54,32 +54,6 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<!-- <table ng-table="mainTableParams" class="table table-hover table-striped table-bordered">
<tbody>
<tr ng-repeat="campaign in $data | orderBy:modified_date:true" class="editable-row">
<td data-title="'Created Date'" class="col-sm-1">campaign.created_date | date:'medium'</td>
<td data-title="'Name'" class="col-sm-2">campaign.name
<div class="btn-group" style="float: right;">
<button type="button" class="btn btn-primary dropdown-toggle edit-button" data-toggle="dropdown">
<span class="caret" style="border-top-color:#FFFFFF"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" style="left:auto; right:0;" role="menu">
<li><a ng-href="#/campaigns/campaign.id">View</a>
</li>
<li><a href="/campaigns/campaign.id/relaunch">Relaunch</a>
</li>
<li class="divider"></li>
<li><a ng-click="deleteCampaign(campaign)">Delete</a>
</li>
</ul>
</div>
</td>
<td data-title="'Status'" class="col-sm-1">campaign.status</td>
</tr>
</tbody>
</table> -->
</div>
</div> </div>
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
@ -96,8 +70,9 @@
<input type="text" class="form-control" id="name" placeholder="Campaign name" autofocus> <input type="text" class="form-control" id="name" placeholder="Campaign name" autofocus>
<br /> <br />
<label class="control-label" for="template">Template:</label> <label class="control-label" for="template">Template:</label>
<input type="text" class="form-control" placeholder="Template Name" id="template"/> <input type="text" class="typeahead form-control" placeholder="Template Name" id="template"/>
<br /> <br>
<br>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab"> <div class="panel-heading" role="tab">
<a role="button" class="collapsed" data-toggle="collapse" href="#smtpPanel" aria-expanded="false" aria-controls="#smtpPanel"> <a role="button" class="collapsed" data-toggle="collapse" href="#smtpPanel" aria-expanded="false" aria-controls="#smtpPanel">