Merge pull request getredash#155 from EverythingMe/vis-fix

[getredash#144] Allow users to edit raw JSON visualization options
hailocab · Mar 26, 2014 · ecb80df · ecb80df
2 parents a503e20 + 55167ad
commit ecb80df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/rd_ui/app/scripts/directives/directives.js b/rd_ui/app/scripts/directives/directives.js
@@ -335,6 +335,9 @@
               ngModel.$parsers.push(into);
               ngModel.$formatters.push(out);
 
+              scope.$watch(attr.ngModel, function(newValue) {
+                element[0].value = out(newValue);
+              }, true);
             }
         };
     });

diff --git a/rd_ui/app/scripts/visualizations/base.js b/rd_ui/app/scripts/visualizations/base.js
@@ -102,6 +102,7 @@
                 visualization: '=?'
             },
             link: function (scope, element, attrs) {
+                scope.editRawOptions = currentUser.hasPermission('edit_raw_chart');
                 scope.visTypes = Visualization.visualizationTypes;
 
                 scope.newVisualization = function(q) {

diff --git a/rd_ui/app/views/visualizations/edit_visualization.html b/rd_ui/app/views/visualizations/edit_visualization.html
@@ -11,6 +11,11 @@
 
   <visualization-options-editor></visualization-options-editor>
 
+  <div class="form-group" ng-if="editRawOptions">
+    <label class="control-label">Advanced</label>
+    <textarea json-text ng-model="visualization.options" class="form-control" rows="10"></textarea>
+  </div>
+
   <div class="form-group">
     <button type="submit" class="btn btn-primary">Save</button>
   </div>