added refresh buttons to all tables, fixed loading behavior to a proper cascading function call
parent
a88ae8258a
commit
9064b49a54
|
@ -366,7 +366,8 @@
|
|||
},
|
||||
|
||||
events:{
|
||||
"click .btn-primary":"newClient"
|
||||
"click .new-client":"newClient",
|
||||
"click .refresh-table":"refreshTable"
|
||||
},
|
||||
|
||||
newClient:function () {
|
||||
|
@ -384,6 +385,15 @@
|
|||
}, this);
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
refreshTable:function() {
|
||||
var _self = this;
|
||||
this.model.fetch({
|
||||
success: function() {
|
||||
_self.render();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -629,7 +639,9 @@
|
|||
|
||||
initialize:function() { },
|
||||
|
||||
events: { },
|
||||
events: {
|
||||
"click .refresh-table":"refreshTable"
|
||||
},
|
||||
|
||||
render:function (eventName) {
|
||||
$(this.el).html($('#tmpl-grant-table').html());
|
||||
|
@ -645,8 +657,17 @@
|
|||
}, this);
|
||||
|
||||
return this;
|
||||
}
|
||||
},
|
||||
|
||||
refreshTable:function() {
|
||||
var _self = this;
|
||||
this.model.fetch({
|
||||
success: function() {
|
||||
_self.render();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
var ApprovedSiteView = Backbone.View.extend({
|
||||
|
@ -702,7 +723,9 @@
|
|||
//this.model.bind("reset", this.render, this);
|
||||
},
|
||||
|
||||
events:{ },
|
||||
events:{
|
||||
"click .refresh-table":"refreshTable"
|
||||
},
|
||||
|
||||
render:function (eventName) {
|
||||
$(this.el).html($('#tmpl-whitelist-table').html());
|
||||
|
@ -720,8 +743,16 @@
|
|||
}, this);
|
||||
|
||||
return this;
|
||||
}
|
||||
},
|
||||
|
||||
refreshTable:function() {
|
||||
var _self = this;
|
||||
this.model.fetch({
|
||||
success: function() {
|
||||
_self.render();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
var WhiteListView = Backbone.View.extend({
|
||||
|
@ -894,19 +925,16 @@
|
|||
//
|
||||
|
||||
// load things in the right order:
|
||||
|
||||
this.clientList.on('reset', function(collection, response) {
|
||||
app.whiteListList.fetch();
|
||||
this.clientList.fetch({
|
||||
success: function(collection, response) {
|
||||
app.whiteListList.fetch({
|
||||
success: function(collection, response) {
|
||||
var baseUrl = $.url($('base').attr('href'));
|
||||
Backbone.history.start({pushState: true, root: baseUrl.attr('relative') + 'manage/'});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
this.whiteListList.on('reset', function(collection, response) {
|
||||
var baseUrl = $.url($('base').attr('href'));
|
||||
Backbone.history.start({pushState: true, root: baseUrl.attr('relative') + 'manage/'});
|
||||
});
|
||||
|
||||
|
||||
// start the loading process
|
||||
this.clientList.fetch();
|
||||
|
||||
},
|
||||
|
||||
|
|
|
@ -19,7 +19,8 @@
|
|||
|
||||
<script type="text/html" id="tmpl-client-table">
|
||||
<div class="well">
|
||||
<button class="btn btn-small btn-primary">New Client</button>
|
||||
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i></button>
|
||||
<button class="btn btn-small btn-primary new-client">New Client</button>
|
||||
</div>
|
||||
|
||||
<table id="client-table" class="table">
|
||||
|
@ -35,7 +36,8 @@
|
|||
</table>
|
||||
|
||||
<div class="well">
|
||||
<button class="btn btn-small btn-primary">New Client</button>
|
||||
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i></button>
|
||||
<button class="btn btn-small btn-primary new-client">New Client</button>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
@ -280,6 +282,10 @@
|
|||
</script>
|
||||
|
||||
<script type="text/html" id="tmpl-whitelist-table">
|
||||
<div class="well">
|
||||
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i></button>
|
||||
</div>
|
||||
|
||||
<table id="whitelist-table" class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
|
@ -292,6 +298,10 @@
|
|||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="well">
|
||||
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i></button>
|
||||
</div>
|
||||
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="tmpl-whitelist-form">
|
||||
|
@ -334,6 +344,10 @@
|
|||
|
||||
<h2>Your approved sites</h2>
|
||||
|
||||
<div class="well">
|
||||
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i></button>
|
||||
</div>
|
||||
|
||||
<table id="grant-table" class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
|
@ -348,6 +362,10 @@
|
|||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="well">
|
||||
<button class="btn btn-small refresh-table"><i class="icon-refresh"></i></button>
|
||||
</div>
|
||||
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="tmpl-grant">
|
||||
|
|
Loading…
Reference in New Issue