From af695f91ab27a6b3b767bc24ff114d6080c16c4a Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Fri, 10 Mar 2017 17:20:37 +0100
Subject: [PATCH] add table button just adds table, no col select
---
.../app/directives/edit/addItemsMenu.js | 34 +++++--------------
1 file changed, 9 insertions(+), 25 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
index 14e416af1..bd4f195a8 100644
--- a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
+++ b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
@@ -44,19 +44,12 @@ angular.module('reportApp')
scope.plottables = ExperimentsService.plottables;
- // use the data sub-obj to hold the selected fields
- // to keep twoway binding
- scope.newTable = { data: [] };
-
- scope.addNewTable = function() {
- return () => {
- let id = getNextItemId('table');
- scope.group.addReportItem(id, {
- fields: Array.from(scope.newTable.data),
- precision: 10
- });
- scope.newTable.data.length = 0;
- };
+ scope.addNewTable = () => {
+ let id = getNextItemId('table');
+ scope.group.addReportItem(id, {
+ fields: [],
+ precision: 10
+ });
};
scope.addNewPlot = (content) => {
@@ -68,8 +61,6 @@ angular.module('reportApp')
let id = getNextItemId('text');
scope.group.addReportItem(id, '');
};
-
- scope.tableFieldSelectorId = `${scope.group.name}_newTableDropdownToggle`;
},
template: `
<div class="btn-group" role="group">
@@ -83,16 +74,9 @@ angular.module('reportApp')
</li>
</ul>
</div>
-<div class="btn-group" role="group"
- group-table-field-selector
- id='tableFieldSelectorId'
- group='group'
- cols-selected='newTable.data'
- button-action='addNewTable()'
- title="Add Table"
- button-text="Add Table"
- >
-</div>
+<button class='btn btn-default' ng-click='addNewTable()'>
+ Add Table
+</button>
<div class="btn-group" role="group">
<button ng-disabled='!isEditable'
ng-click='addNewText()'
--
GitLab