Update handling of Backbone view options

Newer versions of Backbone no longer implicitly attach these to the view, so the relevant initialize functions now do so explicitly.
rockstor · Oct 18, 2016 · bf3756b · bf3756b
1 parent 055221b
commit bf3756b
Show file tree

Hide file tree

Showing 28 changed files with 322 additions and 292 deletions.
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/rockstor.js b/src/rockstor/storageadmin/static/storageadmin/js/rockstor.js
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_afp_share.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_afp_share.js
@@ -29,7 +29,8 @@ AddAFPShareView = RockstorLayoutView.extend({
     "click #cancel": "cancel"
   },
 
-  initialize: function() {
+  initialize: function(options) {
+    this.options = options || {}
     this.constructor.__super__.initialize.apply(this, arguments);
     this.template = window.JST.afp_add_afp_share;
     this.shares = new ShareCollection();

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_group.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_group.js
@@ -29,7 +29,8 @@ AddGroupView = RockstorLayoutView.extend({
 	"click #cancel": "cancel"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+    this.options = options || {}
 	// call initialize of base
 	this.constructor.__super__.initialize.apply(this, arguments);
 	// set template

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_replication_task.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_replication_task.js
@@ -32,6 +32,7 @@ AddReplicationTaskView = RockstorLayoutView.extend({
     },
 
     initialize: function() {
+    this.options = options || {}
 	this.constructor.__super__.initialize.apply(this, arguments);
 	this.template = window.JST.replication_add_replication_task;
 	this.shares = new ShareCollection();

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_samba_export.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_samba_export.js
@@ -31,7 +31,8 @@ AddSambaExportView = RockstorLayoutView.extend({
 		'click #shadow_copy': 'toggleSnapPrefix'
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		this.constructor.__super__.initialize.apply(this, arguments);
 		this.template = window.JST.samba_add_samba_export;
 		this.shares = new ShareCollection();

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_share.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_share.js
@@ -33,7 +33,8 @@ AddShareView = Backbone.View.extend({
     "click #js-cancel": "cancel"
   },
 
-  initialize: function() {
+  initialize: function(options) {
+    this.options = options || {}
     var _this = this;
     this.pools = new PoolCollection();
     this.pools.pageSize = RockStorGlobals.maxPageSize;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_user.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_user.js
@@ -29,7 +29,8 @@ AddUserView = RockstorLayoutView.extend({
 	"click #cancel": "cancel"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+    this.options = options || {}
 	// call initialize of base
 	this.constructor.__super__.initialize.apply(this, arguments);
 	// set template

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/blink_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/blink_disks.js
@@ -29,7 +29,8 @@ BlinkDiskView = RockstorLayoutView.extend({
     'click #cancel': 'cancel'
   },
 
-  initialize: function() {
+  initialize: function(options) {
+    this.options = options || {}
     this.constructor.__super__.initialize.apply(this, arguments);
     this.template = window.JST.disk_blink_disks;
     this.disks = new DiskCollection();

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js b/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js
@@ -32,7 +32,8 @@ ConfigureServiceView = RockstorLayoutView.extend({
         "click #mode": "toggleNutFields"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
         // call initialize of base
         var _this = this;
         this.constructor.__super__.initialize.apply(this, arguments);

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/dashboard_config.js b/src/rockstor/storageadmin/static/storageadmin/js/views/dashboard_config.js
@@ -29,7 +29,8 @@ DashboardConfigView = Backbone.View.extend({
 	"click .widget-name": "widgetClicked"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+    this.options = options || {}
 	this.dashboardconfig = this.options.dashboardconfig;
 	this.template = window.JST.dashboard_dashboard_config;
 	this.parentView = this.options.parentView;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/disk_details_layout_view.js b/src/rockstor/storageadmin/static/storageadmin/js/views/disk_details_layout_view.js
@@ -26,7 +26,8 @@
 
 DiskDetailsLayoutView = RockstorLayoutView.extend({
 
-    initialize: function () {
+    initialize: function (options) {
+        this.options = options || {}
         // call initialize of base
         this.constructor.__super__.initialize.apply(this, arguments);
         this.diskName = this.options.diskName;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/docker_service.js b/src/rockstor/storageadmin/static/storageadmin/js/views/docker_service.js
@@ -29,7 +29,8 @@ DockerServiceView = Backbone.View.extend({
 		'switchChange.bootstrapSwitch': 'switchStatus',
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		this.template = window.JST.rockons_docker_service;
 		this.serviceName = 'docker';
 		this.service = new Service({name: this.serviceName});

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/edit_network_connection.js b/src/rockstor/storageadmin/static/storageadmin/js/views/edit_network_connection.js
@@ -33,7 +33,8 @@ NetworkConnectionView = RockstorLayoutView.extend({
 	'change #ctype': 'renderCTypeOptionalFields'
     },
 
-    initialize: function() {
+    initialize: function(options) {
+    this.options = options || {}
 	this.constructor.__super__.initialize.apply(this, arguments);
 	this.connectionId = this.options.connectionId || null;
 	this.connection = null;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/edit_nfs_export.js b/src/rockstor/storageadmin/static/storageadmin/js/views/edit_nfs_export.js
@@ -29,7 +29,8 @@ EditNFSExportView = RockstorLayoutView.extend({
 		'click #cancel': 'cancel'
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		this.constructor.__super__.initialize.apply(this, arguments);
 		this.template = window.JST.nfs_edit_nfs_export;
 		this.shares = new ShareCollection();

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/pool_details_layout_view.js b/src/rockstor/storageadmin/static/storageadmin/js/views/pool_details_layout_view.js
@@ -26,7 +26,8 @@
 
 PoolDetailsLayoutView = RockstorLayoutView.extend({
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		// call initialize of base
 		this.constructor.__super__.initialize.apply(this, arguments);
 		this.poolName = this.options.poolName;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/pool_rebalance_table.js b/src/rockstor/storageadmin/static/storageadmin/js/views/pool_rebalance_table.js
@@ -30,7 +30,8 @@ PoolRebalanceTableModule  = RockstorModuleView.extend({
 		"click #js-poolrebalance-cancel": "cancel"
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		this.template = window.JST.pool_poolrebalance_table_template;
 		this.startRebalanceTemplate = window.JST.pool_poolrebalance_start_template;
 		this.module_name = 'poolrebalances';

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/pool_scrub_table.js b/src/rockstor/storageadmin/static/storageadmin/js/views/pool_scrub_table.js
@@ -30,7 +30,8 @@ PoolScrubTableModule  = RockstorModuleView.extend({
 		"click #js-poolscrub-cancel": "cancel"
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		this.template = window.JST.pool_poolscrub_table_template;
 		this.startScrubTemplate = window.JST.pool_poolscrub_start_template;
 		this.module_name = 'poolscrubs';

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/replica_receive_trails.js b/src/rockstor/storageadmin/static/storageadmin/js/views/replica_receive_trails.js
@@ -29,7 +29,8 @@ ReplicaReceiveTrailsView = RockstorLayoutView.extend({
 	events: {
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		// call initialize of base
 		this.constructor.__super__.initialize.apply(this, arguments);
 		// set template

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/replica_trails.js b/src/rockstor/storageadmin/static/storageadmin/js/views/replica_trails.js
@@ -29,7 +29,8 @@ ReplicaTrailsView = RockstorLayoutView.extend({
 	events: {
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		// call initialize of base
 		this.constructor.__super__.initialize.apply(this, arguments);
 		// set template

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/rollback.js b/src/rockstor/storageadmin/static/storageadmin/js/views/rollback.js
@@ -30,7 +30,8 @@ RollbackView = RockstorLayoutView.extend({
 		'click #js-confirm-rollback-submit': 'confirmRollback'
 	},
 
-	initialize: function() {
+    initialize: function(option) {
+        this.options = options || {}
 		this.constructor.__super__.initialize.apply(this, arguments);
 		// Templates
 		this.template = window.JST.share_rollback;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/setup_system.js b/src/rockstor/storageadmin/static/storageadmin/js/views/setup_system.js
@@ -27,7 +27,8 @@
 SetupSystemView = Backbone.View.extend({
   tagName: 'div',
 
-  initialize: function() {
+  initialize: function(options) {
+    this.options = options || {}
     this.template = window.JST.setup_system;
     this.sysinfo = this.options.sysinfo;
   },

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/share_details_layout_view.js b/src/rockstor/storageadmin/static/storageadmin/js/views/share_details_layout_view.js
@@ -38,7 +38,8 @@ ShareDetailsLayoutView = RockstorLayoutView.extend({
 		"click #js-confirm-share-delete": "confirmShareDelete",
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		// call initialize of base
 		this.constructor.__super__.initialize.apply(this, arguments);
 		this.shareName = this.options.shareName;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/share_usage_module.js b/src/rockstor/storageadmin/static/storageadmin/js/views/share_usage_module.js
@@ -32,7 +32,8 @@ ShareUsageModule = RockstorModuleView.extend({
 
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		this.template = window.JST.share_share_usage_module;
 		this.editTemplate = window.JST.share_share_usage_edit;
 		this.module_name = 'share-usage';

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js
@@ -29,7 +29,8 @@ SmartcustomDiskView = RockstorLayoutView.extend({
         'click #cancel': 'cancel'
     },
 
-    initialize: function () {
+    initialize: function (options) {
+        this.options = options || {}
         this.constructor.__super__.initialize.apply(this, arguments);
         this.template = window.JST.disk_smartcustom_disks;
         this.disks = new DiskCollection();

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots.js b/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots.js
@@ -34,7 +34,8 @@ SnapshotsView = SnapshotsCommonView.extend({
 	"click #js-snapshot-delete-multiple": "deleteMultipleSnapshots"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+    this.options = options || {}
 	this.constructor.__super__.initialize.apply(this, arguments);
 	this.template = window.JST.share_snapshots;
 	this.addTemplate = window.JST.share_snapshot_add_template;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots_table.js b/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots_table.js
@@ -35,7 +35,8 @@ SnapshotsTableModule = SnapshotsCommonView.extend({
 	"click #js-snapshot-delete-multiple": "deleteMultipleSnapshots"
     },
 
-    initialize: function() {
+    initialize: function(options) {
+    this.options = options || {}
 	this.template = window.JST.share_snapshots_table_template;
 	this.addTemplate = window.JST.share_snapshot_add;
 	this.module_name = 'snapshots';

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js
@@ -29,7 +29,8 @@ SpindownDiskView = RockstorLayoutView.extend({
         'click #cancel': 'cancel'
     },
 
-    initialize: function () {
+    initialize: function (options) {
+        this.options = options || {}
         var _this = this;
         this.constructor.__super__.initialize.apply(this, arguments);
         this.template = window.JST.disk_spindown_disks;

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js
@@ -29,7 +29,8 @@ TasksView = RockstorLayoutView.extend({
 	events: {
 	},
 
-	initialize: function() {
+    initialize: function(options) {
+        this.options = options || {}
 		// call initialize of base
 		this.constructor.__super__.initialize.apply(this, arguments);
 		// set template