From 4eca94936d04819f3e63854594721b9fa659a489 Mon Sep 17 00:00:00 2001 From: Steven Franzen Date: Sun, 16 Oct 2016 00:39:53 +0200 Subject: [PATCH] Update all occurrences of this.options New Backbone versions no longer automatically set this on the object, you have to pass it to initialize(). --- .../static/storageadmin/js/rockstor.js | 22 +++++++++---------- .../storageadmin/js/views/add_afp_share.js | 4 ++-- .../static/storageadmin/js/views/add_group.js | 4 ++-- .../js/views/add_replication_task.js | 4 ++-- .../storageadmin/js/views/add_samba_export.js | 4 ++-- .../js/views/add_scheduled_task.js | 4 ++-- .../static/storageadmin/js/views/add_share.js | 4 ++-- .../static/storageadmin/js/views/add_user.js | 4 ++-- .../storageadmin/js/views/blink_disks.js | 4 ++-- .../js/views/configure_service.js | 6 ++--- .../storageadmin/js/views/create_clone.js | 8 +++---- .../storageadmin/js/views/dashboard_config.js | 6 ++--- .../js/views/disk_details_layout_view.js | 4 ++-- .../storageadmin/js/views/docker_service.js | 4 ++-- .../js/views/edit_network_connection.js | 4 ++-- .../storageadmin/js/views/edit_nfs_export.js | 4 ++-- .../js/views/pool_details_layout_view.js | 6 ++--- .../js/views/pool_rebalance_table.js | 10 ++++----- .../storageadmin/js/views/pool_scrub_table.js | 10 ++++----- .../js/views/replica_receive_trails.js | 4 ++-- .../storageadmin/js/views/replica_trails.js | 4 ++-- .../static/storageadmin/js/views/rollback.js | 6 ++--- .../storageadmin/js/views/setup_system.js | 4 ++-- .../js/views/share_details_layout_view.js | 6 ++--- .../js/views/share_usage_module.js | 4 ++-- .../js/views/smartcustom_disks.js | 4 ++-- .../static/storageadmin/js/views/snapshots.js | 6 ++--- .../storageadmin/js/views/snapshots_table.js | 10 ++++----- .../storageadmin/js/views/spindown_disks.js | 4 ++-- .../static/storageadmin/js/views/tasks.js | 4 ++-- 30 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/rockstor/storageadmin/static/storageadmin/js/rockstor.js b/src/rockstor/storageadmin/static/storageadmin/js/rockstor.js index 06608af00..ad4ae7b7e 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/rockstor.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/rockstor.js @@ -118,11 +118,11 @@ RockStorWidgetView = Backbone.View.extend({ 'click .download-widget': 'download' }, - initialize: function() { - this.maximized = this.options.maximized; - this.name = this.options.name; - this.displayName = this.options.displayName; - this.parentView = this.options.parentView; + initialize: function(options) { + this.maximized = options.maximized; + this.name = options.name; + this.displayName = options.displayName; + this.parentView = options.parentView; this.dependencies = []; }, @@ -455,9 +455,9 @@ var RockstorUtil = function() { RockstorWizardPage = Backbone.View.extend({ - initialize: function() { - this.evAgg = this.options.evAgg; - this.parent = this.options.parent; + initialize: function(options) { + this.evAgg = options.evAgg; + this.parent = options.parent; }, render: function() { @@ -480,7 +480,7 @@ WizardView = Backbone.View.extend({ 'click #prev-page': 'prevPage' }, - initialize: function() { + initialize: function(options) { this.template = window.JST.wizard_wizard; this.pages = null; this.currentPage = null; @@ -489,8 +489,8 @@ WizardView = Backbone.View.extend({ this.evAgg = _.extend({}, Backbone.Events); this.evAgg.bind('nextPage', this.nextPage, this); this.evAgg.bind('prevPage', this.prevPage, this); - this.parent = this.options.parent; - this.title = this.options.title; + this.parent = options.parent; + this.title = options.title; }, setPages: function(pages) { 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 index 117709d25..aad7f1592 100644 --- 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,14 +29,14 @@ AddAFPShareView = RockstorLayoutView.extend({ "click #cancel": "cancel" }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.afp_add_afp_share; this.shares = new ShareCollection(); // dont paginate shares for now this.shares.pageSize = RockStorGlobals.maxPageSize; this.dependencies.push(this.shares); - this.afpShareId = this.options.afpShareId || null; + this.afpShareId = options.afpShareId || null; this.afpShares = new AFPCollection({afpShareId: this.afpShareId}); this.dependencies.push(this.afpShares); this.yes_no_choices = [ diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_group.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_group.js index dcee5c394..6f05510b1 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/add_group.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/add_group.js @@ -29,12 +29,12 @@ AddGroupView = RockstorLayoutView.extend({ "click #cancel": "cancel" }, - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); // set template this.template = window.JST.users_add_group; - this.groupname = this.options.groupname; + this.groupname = options.groupname; this.group = new Group({groupname: this.groupname}); this.dependencies.push(this.group); }, 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 index 46835e5d3..91de199ce 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/add_replication_task.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/add_replication_task.js @@ -31,7 +31,7 @@ AddReplicationTaskView = RockstorLayoutView.extend({ "change #appliance": "fetchRemotePools" }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.replication_add_replication_task; this.shares = new ShareCollection(); @@ -44,7 +44,7 @@ AddReplicationTaskView = RockstorLayoutView.extend({ this.dependencies.push(this.replicas); this.remote_pools = []; - this.replicaId = this.options.replicaId; + this.replicaId = options.replicaId; if (!_.isUndefined(this.replicaId) && !_.isNull(this.replicaId)) { this.replica = new Replica({id: this.replicaId}); 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 index 8dfa71871..7956ff18e 100644 --- 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,7 @@ AddSambaExportView = RockstorLayoutView.extend({ 'click #shadow_copy': 'toggleSnapPrefix' }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.samba_add_samba_export; this.shares = new ShareCollection(); @@ -41,7 +41,7 @@ AddSambaExportView = RockstorLayoutView.extend({ this.users.pageSize = RockStorGlobals.maxPageSize; this.dependencies.push(this.shares); this.dependencies.push(this.users); - this.sambaShareId = this.options.sambaShareId || null; + this.sambaShareId = options.sambaShareId || null; this.sambaShares = new SambaCollection({sambaShareId: this.sambaShareId}); this.dependencies.push(this.sambaShares); diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_scheduled_task.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_scheduled_task.js index 3445e45c7..7e1ed9123 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/add_scheduled_task.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/add_scheduled_task.js @@ -31,7 +31,7 @@ AddScheduledTaskView = RockstorLayoutView.extend({ "change #task_type": "renderOptionalFields" }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.scheduled_tasks_add_task; this.snapshotFieldsTemplate = window.JST.scheduled_tasks_snapshot_fields; @@ -42,7 +42,7 @@ AddScheduledTaskView = RockstorLayoutView.extend({ this.pools.pageSize = RockStorGlobals.maxPageSize; this.dependencies.push(this.shares); this.dependencies.push(this.pools); - this.taskDefId = this.options.taskDefId; + this.taskDefId = options.taskDefId; if (!_.isUndefined(this.taskDefId) && !_.isNull(this.taskDefId)) { this.taskDef = new TaskDef({id: this.taskDefId}); this.dependencies.push(this.taskDef); diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_share.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_share.js index a2102b051..c69d42177 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/add_share.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/add_share.js @@ -33,11 +33,11 @@ AddShareView = Backbone.View.extend({ "click #js-cancel": "cancel" }, - initialize: function() { + initialize: function(options) { var _this = this; this.pools = new PoolCollection(); this.pools.pageSize = RockStorGlobals.maxPageSize; - this.preSelectedPoolName = this.options.poolName || null; + this.preSelectedPoolName = options.poolName || null; this.tickFormatter = function(d) { var formatter = d3.format(",.1f"); if (d > 1024) { diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/add_user.js b/src/rockstor/storageadmin/static/storageadmin/js/views/add_user.js index c658d3499..895107d95 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/add_user.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/add_user.js @@ -29,12 +29,12 @@ AddUserView = RockstorLayoutView.extend({ "click #cancel": "cancel" }, - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); // set template this.template = window.JST.users_add_user; - this.username = this.options.username; + this.username = options.username; if (!_.isUndefined(this.username)) { this.user = new User({username: this.username}); this.dependencies.push(this.user); diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/blink_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/blink_disks.js index 9258ec0f5..ff35a0db6 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/blink_disks.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/blink_disks.js @@ -29,11 +29,11 @@ BlinkDiskView = RockstorLayoutView.extend({ 'click #cancel': 'cancel' }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.disk_blink_disks; this.disks = new DiskCollection(); - this.diskName = this.options.diskName; + this.diskName = options.diskName; this.dependencies.push(this.disks); }, diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js b/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js index 81115b764..794ab1d32 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js @@ -32,12 +32,12 @@ ConfigureServiceView = RockstorLayoutView.extend({ "click #mode": "toggleNutFields" }, - initialize: function() { + initialize: function(options) { // call initialize of base var _this = this; this.constructor.__super__.initialize.apply(this, arguments); - this.serviceName = this.options.serviceName; - this.adStatus = this.options.adStatus; + this.serviceName = options.serviceName; + this.adStatus = options.adStatus; // set template this.template = window.JST['services_configure_' + this.serviceName]; this.rules = { diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/create_clone.js b/src/rockstor/storageadmin/static/storageadmin/js/views/create_clone.js index f34b22580..7aa2d38e1 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/create_clone.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/create_clone.js @@ -29,12 +29,12 @@ CreateCloneView = RockstorLayoutView.extend({ "click #js-cancel": "cancel" }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.share_create_clone; - this.sourceType = this.options.sourceType; - this.shareName = this.options.shareName; - this.snapName = this.options.snapName; + this.sourceType = options.sourceType; + this.shareName = options.shareName; + this.snapName = options.snapName; }, render: function() { diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/dashboard_config.js b/src/rockstor/storageadmin/static/storageadmin/js/views/dashboard_config.js index fe358e111..72bd42a52 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/dashboard_config.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/dashboard_config.js @@ -29,10 +29,10 @@ DashboardConfigView = Backbone.View.extend({ "click .widget-name": "widgetClicked" }, - initialize: function() { - this.dashboardconfig = this.options.dashboardconfig; + initialize: function(options) { + this.dashboardconfig = options.dashboardconfig; this.template = window.JST.dashboard_dashboard_config; - this.parentView = this.options.parentView; + this.parentView = options.parentView; this.initHandlebarHelpers(); }, 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 index 97972c6ef..708a1a9fb 100644 --- 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,10 +26,10 @@ DiskDetailsLayoutView = RockstorLayoutView.extend({ - initialize: function () { + initialize: function (options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); - this.diskName = this.options.diskName; + this.diskName = options.diskName; this.template = window.JST.disk_disk_details_layout; this.disk = new Disk({diskName: this.diskName}); this.smartinfo = new SmartInfo({diskName: this.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 index f060b0ed6..5d26496ad 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/docker_service.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/docker_service.js @@ -29,11 +29,11 @@ DockerServiceView = Backbone.View.extend({ 'switchChange.bootstrapSwitch': 'switchStatus', }, - initialize: function() { + initialize: function(options) { this.template = window.JST.rockons_docker_service; this.serviceName = 'docker'; this.service = new Service({name: this.serviceName}); - this.parentView = this.options.parentView; + this.parentView = options.parentView; this.updateFreq = 30000; }, 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 index 67e87aa19..9b980e285 100644 --- 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,9 +33,9 @@ NetworkConnectionView = RockstorLayoutView.extend({ 'change #ctype': 'renderCTypeOptionalFields' }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); - this.connectionId = this.options.connectionId || null; + this.connectionId = options.connectionId || null; this.connection = null; this.template = window.JST.network_new_connection; this.devices = new NetworkDeviceCollection(); 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 index 801d62ea0..8aee2c093 100644 --- 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,11 +29,11 @@ EditNFSExportView = RockstorLayoutView.extend({ 'click #cancel': 'cancel' }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.nfs_edit_nfs_export; this.shares = new ShareCollection(); - this.nfsExportGroupId = this.options.nfsExportGroupId; + this.nfsExportGroupId = options.nfsExportGroupId; if(this.nfsExportGroupId > 0) { this.nfsExportGroup = new NFSExportGroup({id: this.nfsExportGroupId}); this.nfsExportNotEmpty = true; 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 index 12b7ad778..1f36d0b5d 100644 --- 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,11 +26,11 @@ PoolDetailsLayoutView = RockstorLayoutView.extend({ - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); - this.poolName = this.options.poolName; - this.cView = this.options.cView; + this.poolName = options.poolName; + this.cView = options.cView; this.template = window.JST.pool_pool_details_layout; this.resize_pool_info_template = window.JST.pool_resize_pool_info; this.compression_info_template = window.JST.pool_compression_info; 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 index 6078d8903..ae9793771 100644 --- 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,15 +30,15 @@ PoolRebalanceTableModule = RockstorModuleView.extend({ "click #js-poolrebalance-cancel": "cancel" }, - initialize: function() { + initialize: function(options) { this.template = window.JST.pool_poolrebalance_table_template; this.startRebalanceTemplate = window.JST.pool_poolrebalance_start_template; this.module_name = 'poolrebalances'; - this.pool = this.options.pool; - this.poolrebalances = this.options.poolrebalances; - this.collection = this.options.poolrebalances; + this.pool = options.pool; + this.poolrebalances = options.poolrebalances; + this.collection = options.poolrebalances; this.collection.on("reset", this.render, this); - this.parentView = this.options.parentView; + this.parentView = options.parentView; this.initHandlebarHelpers(); }, 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 index 725ee577c..6815e584a 100644 --- 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,15 +30,15 @@ PoolScrubTableModule = RockstorModuleView.extend({ "click #js-poolscrub-cancel": "cancel" }, - initialize: function() { + initialize: function(options) { this.template = window.JST.pool_poolscrub_table_template; this.startScrubTemplate = window.JST.pool_poolscrub_start_template; this.module_name = 'poolscrubs'; - this.pool = this.options.pool; - this.poolscrubs = this.options.poolscrubs; - this.collection = this.options.poolscrubs; + this.pool = options.pool; + this.poolscrubs = options.poolscrubs; + this.collection = options.poolscrubs; this.collection.on("reset", this.render, this); - this.parentView = this.options.parentView; + this.parentView = options.parentView; this.initHandlebarHelpers(); }, 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 index e2237e2d4..4e93ed9e0 100644 --- 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,13 +29,13 @@ ReplicaReceiveTrailsView = RockstorLayoutView.extend({ events: { }, - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); // set template this.template = window.JST.replication_receive_trails; // add dependencies - this.replicaShareId = this.options.replicaShareId; + this.replicaShareId = options.replicaShareId; this.replicaShare = new ReplicaShare({id: this.replicaShareId}); this.dependencies.push(this.replicaShare); this.collection = new ReceiveTrailCollection(null, { diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/replica_trails.js b/src/rockstor/storageadmin/static/storageadmin/js/views/replica_trails.js index 6081ccfac..bd23d9dcd 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/replica_trails.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/replica_trails.js @@ -29,13 +29,13 @@ ReplicaTrailsView = RockstorLayoutView.extend({ events: { }, - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); // set template this.template = window.JST.replication_replica_trails; // add dependencies - this.replicaId = this.options.replicaId; + this.replicaId = options.replicaId; this.replica = new Replica({id: this.replicaId}); this.dependencies.push(this.replica); this.collection = new ReplicaTrailCollection(null, { diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/rollback.js b/src/rockstor/storageadmin/static/storageadmin/js/views/rollback.js index b21cd0715..dc6b776b5 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/rollback.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/rollback.js @@ -30,16 +30,16 @@ RollbackView = RockstorLayoutView.extend({ 'click #js-confirm-rollback-submit': 'confirmRollback' }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); // Templates this.template = window.JST.share_rollback; this.snapshot_list_template = window.JST.share_rollback_snapshot_list; // Dependencies - this.share = new Share({shareName: this.options.shareName}); + this.share = new Share({shareName: options.shareName}); this.collection = new SnapshotCollection(); this.collection.pageSize = 10; - this.collection.setUrl(this.options.shareName); + this.collection.setUrl(options.shareName); this.dependencies.push(this.share); this.dependencies.push(this.collection); this.collection.on('reset', this.renderSnapshotList, this); diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/setup_system.js b/src/rockstor/storageadmin/static/storageadmin/js/views/setup_system.js index d2aff64db..72e38cafb 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/setup_system.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/setup_system.js @@ -27,9 +27,9 @@ SetupSystemView = Backbone.View.extend({ tagName: 'div', - initialize: function() { + initialize: function(options) { this.template = window.JST.setup_system; - this.sysinfo = this.options.sysinfo; + this.sysinfo = options.sysinfo; }, render: function() { 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 index 7516118b9..b98272cd4 100644 --- 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,10 +38,10 @@ ShareDetailsLayoutView = RockstorLayoutView.extend({ "click #js-confirm-share-delete": "confirmShareDelete", }, - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); - this.shareName = this.options.shareName; + this.shareName = options.shareName; this.template = window.JST.share_share_details_layout; this.rollback_btn_template = window.JST.share_share_details_rollback_btn; this.shareAclTemplate = window.JST.share_share_acl; @@ -81,7 +81,7 @@ ShareDetailsLayoutView = RockstorLayoutView.extend({ ]; this.on('snapshotsModified', this.renderRollbackBtn, this); this.cOpts = {'no': 'Dont enable compression', 'zlib': 'zlib', 'lzo': 'lzo'}; - this.cView = this.options.cView; + this.cView = options.cView; this.initHandlebarHelpers(); }, 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 index 46f796ab5..d9393ed8d 100644 --- 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,11 +32,11 @@ ShareUsageModule = RockstorModuleView.extend({ }, - initialize: function() { + initialize: function(options) { this.template = window.JST.share_share_usage_module; this.editTemplate = window.JST.share_share_usage_edit; this.module_name = 'share-usage'; - this.share = this.options.share; + this.share = options.share; this.initHandlebarHelpers(); }, diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js index f8e10b3cd..f4dbf09cb 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/smartcustom_disks.js @@ -29,11 +29,11 @@ SmartcustomDiskView = RockstorLayoutView.extend({ 'click #cancel': 'cancel' }, - initialize: function () { + initialize: function (options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.disk_smartcustom_disks; this.disks = new DiskCollection(); - this.diskName = this.options.diskName; + this.diskName = options.diskName; this.dependencies.push(this.disks); }, diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots.js b/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots.js index f23927361..0a529a413 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots.js @@ -34,12 +34,12 @@ SnapshotsView = SnapshotsCommonView.extend({ "click #js-snapshot-delete-multiple": "deleteMultipleSnapshots" }, - initialize: function() { + initialize: function(options) { this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.share_snapshots; this.addTemplate = window.JST.share_snapshot_add_template; this.module_name = 'snapshots'; - this.snapshots = this.options.snapshots; + this.snapshots = options.snapshots; this.collection = new SnapshotsCollection(); this.shares = new ShareCollection(); this.dependencies.push(this.shares); @@ -52,7 +52,7 @@ SnapshotsView = SnapshotsCommonView.extend({ {name: 'yes', value: 'yes'}, {name: 'no', value: 'no'}, ]; - this.parentView = this.options.parentView; + this.parentView = options.parentView; this.collection.on("reset", this.renderSnapshots, this); this.initHandlebarHelpers(); }, diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots_table.js b/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots_table.js index 478220317..152a91bba 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots_table.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/snapshots_table.js @@ -35,20 +35,20 @@ SnapshotsTableModule = SnapshotsCommonView.extend({ "click #js-snapshot-delete-multiple": "deleteMultipleSnapshots" }, - initialize: function() { + initialize: function(options) { this.template = window.JST.share_snapshots_table_template; this.addTemplate = window.JST.share_snapshot_add; this.module_name = 'snapshots'; - this.share = this.options.share; - this.snapshots = this.options.snapshots; - this.collection = this.options.snapshots; + this.share = options.share; + this.snapshots = options.snapshots; + this.collection = options.snapshots; this.collection.on("reset", this.render, this); this.selectedSnapshots = []; this.modify_choices = [ {name: 'yes', value: 'yes'}, {name: 'no', value: 'no'}, ]; - this.parentView = this.options.parentView; + this.parentView = options.parentView; this.initHandlebarHelpers(); }, diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js index aa908a6ab..97478fa7d 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/spindown_disks.js @@ -29,12 +29,12 @@ SpindownDiskView = RockstorLayoutView.extend({ 'click #cancel': 'cancel' }, - initialize: function () { + initialize: function (options) { var _this = this; this.constructor.__super__.initialize.apply(this, arguments); this.template = window.JST.disk_spindown_disks; this.disks = new DiskCollection(); - this.diskName = this.options.diskName; + this.diskName = options.diskName; this.dependencies.push(this.disks); this.tickFormatter = function (d) { var formatter = d3.format(",.0f"); diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js index 5c560c40d..bc9ba04cd 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js +++ b/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js @@ -29,13 +29,13 @@ TasksView = RockstorLayoutView.extend({ events: { }, - initialize: function() { + initialize: function(options) { // call initialize of base this.constructor.__super__.initialize.apply(this, arguments); // set template this.template = window.JST.scheduled_tasks_tasks; // add dependencies - this.taskDefId = this.options.taskDefId; + this.taskDefId = options.taskDefId; this.taskDef = new TaskDef({id: this.taskDefId}); this.dependencies.push(this.taskDef); this.collection = new TaskCollection(null, {