[PATCH 2/2] BZ 789000 change PoolsIndex to always use Conductor.Models.Pools, allowing for more consistent queries
Tomas Sedovic
tsedovic at redhat.com
Fri Feb 10 13:20:57 UTC 2012
On 02/10/2012 07:44 AM, Tzu-Mainn Chen wrote:
> ---
> src/public/javascripts/backbone/routers.js | 14 +-------------
> src/public/javascripts/backbone/views.js | 5 +++++
> 2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/src/public/javascripts/backbone/routers.js b/src/public/javascripts/backbone/routers.js
> index 2e17348..cc87445 100644
> --- a/src/public/javascripts/backbone/routers.js
> +++ b/src/public/javascripts/backbone/routers.js
> @@ -13,19 +13,7 @@ Conductor.Routers.Pools = Backbone.Router.extend({
> var view = new Conductor.Views.PoolsIndex();
>
> if (view.currentView() == 'table') {
> - switch(view.currentTab()) {
> - case 'pools':
> - view.collection = new Conductor.Models.Pools();
> - break;
> - case 'deployments':
> - view.collection = new Conductor.Models.Deployments();
> - break;
> - case 'instances':
> - view.collection = new Conductor.Models.Instances();
> - break;
> - default:
> - return;
> - }
> + view.collection = new Conductor.Models.Pools();
> }
> else if (view.currentView() == 'pretty') {
> view.collection = new Conductor.Models.Deployments();
> diff --git a/src/public/javascripts/backbone/views.js b/src/public/javascripts/backbone/views.js
> index 5063583..55c0fe0 100644
> --- a/src/public/javascripts/backbone/views.js
> +++ b/src/public/javascripts/backbone/views.js
> @@ -23,6 +23,9 @@ Conductor.Views.PoolsIndex = Backbone.View.extend({
> else if ($('#details_instances.active').length> 0) {
> return 'instances';
> }
> + else {
> + return '';
> + }
> },
>
> template: function() {
> @@ -42,6 +45,8 @@ Conductor.Views.PoolsIndex = Backbone.View.extend({
> var paramsToInclude = [this.currentTab() + '_preset_filter', this.currentTab() + '_search'];
> var result = Conductor.extractQueryParams(paramsToInclude);
>
> + result['details_tab'] = this.currentTab();
> +
> // If there is no URL param for the preset filter, we still need to merge in the preset filter
> var filter = this.currentTab() + '_preset_filter';
> if(result[filter] == undefined) {
ACK
More information about the aeolus-devel
mailing list