Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3152 Fix console column selectors 

The `hawtioConfirmDialog` directive replaces the html of any element with the
class `.modal-body` when the element is shown.
This commit is contained in:
Domenico Francesco Bruscino 2021-03-17 14:28:51 +01:00
parent 15848f317b
commit 14755a0296
2 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
View File

@ -160,31 +160,18 @@ var Artemis;
<p>{{$ctrl.actionText}}</p>
</div>
</div>
<div class="form-group" ng-show="$ctrl.showColumns">
<button class="btn btn-default" data-toggle="modal" data-target="#myModal">Columns</button>
<div class="modal ng-scope">
<div class="modal-dialog ">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title ng-binding">Column Selector</h4>
</div>
<div class="modal-body">
<table class="table-view-container table table-striped table-bordered table-hover dataTable ng-scope ng-isolate-scope no-footer">
<tbody>
<tr ng-repeat="col in $ctrl.dtOptions.columns">
<td>{{ col.name }}</td>
<td><input type="checkbox" ng-model="col.visible" placeholder="Name" autocomplete="off" id="name"></td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default ng-binding" ng-click="$ctrl.showColumns = false;$ctrl.updateColumns()">
Close
</button>
</div>
</div>
</div>
<div hawtio-confirm-dialog="$ctrl.showColumns"
title="Column Selector"
cancel-button-text="Close"
on-cancel="$ctrl.updateColumns()"
show-ok-button="false">
<div class="dialog-body ng-non-bindable" >
<table class="table-view-container table table-striped table-bordered table-hover dataTable ng-scope ng-isolate-scope no-footer">
<tr ng-repeat="col in $ctrl.dtOptions.columns">
<td>{{ col.name }}</td>
<td><input type="checkbox" ng-model="col.visible" placeholder="Name" autocomplete="off" id="name"></td>
</tr>
</table>
</div>
</div>
<script type="text/ng-template" id="browse-instructions.html">

37
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/services/toolbar.js
View File

@ -75,31 +75,18 @@ var Artemis;
</div>
</div>
</div>
<div class="form-group" ng-show="$ctrl.showColumns">
<button class="btn btn-default" data-toggle="modal" data-target="#myModal">Columns</button>
<div class="modal ng-scope">
<div class="modal-dialog ">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title ng-binding">Column Selector</h4>
</div>
<div class="modal-body">
<table class="table-view-container table table-striped table-bordered table-hover dataTable ng-scope ng-isolate-scope no-footer">
<tbody>
<tr ng-repeat="col in $ctrl.dtOptions.columns">
<td>{{ col.name }}</td>
<td><input type="checkbox" ng-model="col.visible" placeholder="Name" autocomplete="off" id="name"></td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default ng-binding" ng-click="$ctrl.showColumns = false;$ctrl.updateColumns()">
Close
</button>
</div>
</div>
</div>
<div hawtio-confirm-dialog="$ctrl.showColumns"
title="Column Selector"
cancel-button-text="Close"
on-cancel="$ctrl.updateColumns()"
show-ok-button="false">
<div class="dialog-body ng-non-bindable" >
<table class="table-view-container table table-striped table-bordered table-hover dataTable no-footer">
<tr ng-repeat="col in $ctrl.dtOptions.columns">
<td>{{ col.name }}</td>
<td><input type="checkbox" ng-model="col.visible" placeholder="Name" autocomplete="off" id="name"></td>
</tr>
</table>
</div>
</div>
</form>