Merge pull request #1864 from phillxnet/1863_share_name_blank_in_edit…

…_schedule_snapshot_page share name blank in edit schedule snapshot page. Fixes #1863
rockstor · Dec 9, 2017 · 9564baa · 9564baa
2 parents d5ba563 + d79d5d2
commit 9564baa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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
@@ -76,10 +76,10 @@ AddScheduledTaskView = RockstorLayoutView.extend({
                 name: this.taskDef.get('name'),
                 type: this.taskDef.get('task_type'),
                 share: this.taskDef.share(),
-                share_name: this.taskDef.share_name(),
+                share_name: this.taskDef.get('share_name'),
                 prefix: this.taskDef.prefix(),
                 pool: this.taskDef.pool(),
-                pool_name: this.taskDef.pool_name(),
+                pool_name: this.taskDef.get('pool_name'),
                 maxCount: this.taskDef.max_count(),
                 visible: this.taskDef.visible(),
                 writable: this.taskDef.writable(),

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js b/src/rockstor/storageadmin/static/storageadmin/js/views/tasks.js
@@ -83,13 +83,13 @@ TasksView = RockstorLayoutView.extend({
                 html += 'Snapshot of Share (<a href="#shares/';
                 // TODO: fix this to go direct to Snapshots tab.
                 html += JSON.parse(this.taskDef.get('json_meta')).share + '">';
-                html += JSON.parse(this.taskDef.get('json_meta')).share_name;
+                html += this.taskDef.get('share_name');
                 html += '</a>): see "Snapshots" tab for details.';
             } else if (this.taskDef.get('task_type') == 'scrub'){
                 html += 'Scrub of Pool (<a href="#pools/';
                 // TODO: fix this to go direct to Scrubs tab.
                 html += JSON.parse(this.taskDef.get('json_meta')).pool + '">';
-                html += JSON.parse(this.taskDef.get('json_meta')).pool_name;
+                html += this.taskDef.get('pool_name');
                 html += '</a>): see "Scrubs" tab for details.';
             } else {
                 html += this.taskDef.get('task_type');