From 37cade7e1de9623b818e710457dcd724ec14b4dd Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Thu, 30 Mar 2017 13:52:58 +0200
Subject: [PATCH] rm redundant refs to isEditable
---
.../static/reports/app/directives/edit/addItemsMenu.js | 5 ++---
.../web/reports/static/reports/app/directives/edit/layout.js | 2 +-
.../static/reports/app/directives/edit/panelContent.js | 1 -
.../static/reports/app/directives/edit/panelExperiments.js | 5 ++---
.../static/reports/app/directives/edit/tableFieldSelector.js | 3 +--
.../reports/static/reports/app/directives/edit/textItem.js | 2 --
6 files changed, 6 insertions(+), 12 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 6af2416b6..dde9770fe 100644
--- a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
+++ b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
@@ -32,7 +32,6 @@ angular.module('reportApp')
group: '='
},
link: function(scope){
- scope.isEditable = GroupsService.isEditable;
const getNextItemId = (type) => {
let count = Object.values(scope.group.reportItems)
.filter(v => v.id.includes(type))
@@ -86,7 +85,7 @@ angular.module('reportApp')
},
template: `
<div class="btn-group" role="group">
- <button ng-disabled='!isEditable' type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Add Plot
<span class="caret"></span>
</button>
@@ -100,7 +99,7 @@ angular.module('reportApp')
Add Table
</button>
<div class="btn-group" role="group">
- <button ng-disabled='!isEditable'
+ <button
ng-click='addNewText()'
type="button"
class="btn btn-default"
diff --git a/beat/web/reports/static/reports/app/directives/edit/layout.js b/beat/web/reports/static/reports/app/directives/edit/layout.js
index ad31140e5..c7b99a60b 100644
--- a/beat/web/reports/static/reports/app/directives/edit/layout.js
+++ b/beat/web/reports/static/reports/app/directives/edit/layout.js
@@ -39,7 +39,7 @@ angular.module('reportApp').directive("groupsLayout", ['GroupsService', function
};
},
template: `
-<div ng-if='GroupsService.isEditable' group-add-group-menu class='panel'></div>
+<div group-add-group-menu class='panel'></div>
<div ui-sortable='sortableOptions' ng-model='GroupsService.groups' id='groupsLayout' class='panel-group'>
<div
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelContent.js b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
index f714b2efb..9bced2aaf 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelContent.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
@@ -31,7 +31,6 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
group: '='
},
link: function(scope){
- scope.isEditable = GroupsService.isEditable;
scope.deleteGroup = GroupsService.deleteGroup;
scope.editingGroupName = false;
scope.change = () => {
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js b/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
index df1c37d4a..6435a1bc9 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
@@ -31,7 +31,6 @@ angular.module('reportApp').directive("groupPanelExperiments", ['GroupsService',
group: '='
},
link: function(scope){
- scope.isEditable = GroupsService.isEditable;
scope.experiments = ExperimentsService.experiments;
scope.dropdownId = `${scope.group.name}_exp_add_dropdown`;
scope.expsNotInGroup = () => {
@@ -66,7 +65,7 @@ angular.module('reportApp').directive("groupPanelExperiments", ['GroupsService',
</a>
<div class='btn-group'>
<div class="dropdown">
- <button ng-disabled='!isEditable' class="btn btn-default dropdown-toggle" ng-class='{disabled: expsNotInGroup().length === 0}' type="button" id="{{ dropdownId }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+ <button class="btn btn-default dropdown-toggle" ng-class='{disabled: expsNotInGroup().length === 0}' type="button" id="{{ dropdownId }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Add Experiment
<span class="caret"></span>
</button>
@@ -118,7 +117,7 @@ angular.module('reportApp').directive("groupPanelExperiments", ['GroupsService',
</span>
</td>
- <td><input ng-disabled='!isEditable' ng-model='group.aliases[expName]'></input></td>
+ <td><input ng-model='group.aliases[expName]'></input></td>
</tr>
</tbody>
</table>
diff --git a/beat/web/reports/static/reports/app/directives/edit/tableFieldSelector.js b/beat/web/reports/static/reports/app/directives/edit/tableFieldSelector.js
index 3305cc2c5..74baebb82 100644
--- a/beat/web/reports/static/reports/app/directives/edit/tableFieldSelector.js
+++ b/beat/web/reports/static/reports/app/directives/edit/tableFieldSelector.js
@@ -37,7 +37,6 @@ angular.module('reportApp')
buttonText: '@'
},
link: function(scope){
- scope.isEditable = GroupsService.isEditable;
// bootstrap's auto dropdown toggling is disabled for the table creation dropdown
// add a click handler for the table creation dropdown submit button to toggle
// manually
@@ -96,7 +95,7 @@ angular.module('reportApp')
};
},
template: `
-<button ng-disabled='!isEditable' id='{{ id }}' type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+<button id='{{ id }}' type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ title }}
<span class="caret"></span>
</button>
diff --git a/beat/web/reports/static/reports/app/directives/edit/textItem.js b/beat/web/reports/static/reports/app/directives/edit/textItem.js
index d55618a86..020fd50f2 100644
--- a/beat/web/reports/static/reports/app/directives/edit/textItem.js
+++ b/beat/web/reports/static/reports/app/directives/edit/textItem.js
@@ -35,14 +35,12 @@ angular.module('reportApp')
link: function(scope){
// aliases
scope.trustAsHtml = $sce.trustAsHtml;
- scope.isEditable = GroupsService.isEditable;
scope.item = scope.reportItem;
scope.domId = `${scope.group.name}_${scope.item.id}`;
// codemirror options
scope.uicmOptions = {
mode: 'rst',
- readOnly: !GroupsService.isEditable
};
// readonly codemirror options
--
GitLab