Skip to content

Commit bdc7a22

Browse files
ggilestroggilestro
committed
Fixed the select all function in the updater
1 parent 453bc14 commit bdc7a22

File tree

1 file changed

+55
-57
lines changed

1 file changed

+55
-57
lines changed

‎scripts/ethoscope_updater/static/index.html

+55-57
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ <h3>Select some devices to perform the actions below:</h3>
7070
<th>Name</th>
7171
<th>Status</th>
7272
<th>Software Version</th>
73-
<th>IP</th>
74-
<th>ID</th>
73+
<th>ip</th>
74+
<th>id</th>
7575
<th>
76-
<center><input type="checkbox" ng-model="selectAll" ng-click="toggleAll()"></center>
76+
<center><input type="checkbox" ng-model="selectAll" ng-change="toggleAll()"></center>
7777
</th>
7878
</tr>
7979
</thead>
8080
<tbody>
8181
<tr>
8282
<td>
8383

84-
<span ng-if="node.check_update.up_to_date==false" class="fa fa-circle color-red"></span> <span ng-if="node.check_update.up_t>
84+
<span ng-if="node.check_update.up_to_date==false" class="fa fa-circle color-red"></span> <span ng-if="node.check_update.up_to_date==true" class="fa fa-circle color-green"></span><span> Node <span ng-if="node.check_update.up_to_date==false"> [Outdated]</span> <span ng-if="node.check_update.up_to_date==true">[Up to Date]</span></span>
8585

8686
</td>
8787
<td>{{node.status}}</td>
@@ -93,79 +93,77 @@ <h3>Select some devices to perform the actions below:</h3>
9393
</td>
9494
<td>
9595
<center>
96-
<input type=" checkbox" checklist-model="selected_devices" checklist-value="node"></center>
96+
<input type="checkbox" checklist-model="selected_devices" checklist-value="node"></center>
9797
</td>
9898
</tr>
9999
<tr ng-repeat="(id,device) in devices" ng-if="(device.status == 'stopped' && device.up_to_date == false) || showAll">
100100

101101
<td>
102102

103-
<span ng-if="device.up_to_date==false" class="fa fa-circle color-red"></span> <span ng-if="device.up_to_date==true" class="f>
104-
<span> {{device.name}}<span ng-if=" device.up_to_date==false"> [Outdated]</span> <span ng-if="device.up_to_date==true">[Up to>
103+
<span ng-if="device.up_to_date==false" class="fa fa-circle color-red"></span> <span ng-if="device.up_to_date==true" class="fa fa-circle color-green"></span>
104+
<span> {{device.name}}<span ng-if="device.up_to_date==false"> [Outdated]</span> <span ng-if="device.up_to_date==true">[Up to Date]</span></span>
105105

106106
</td>
107107
<td> {{device.status}}</td>
108108
<td>[{{device.active_branch}}] {{device.version.id.substring(0,6)}}... ({{device.version.date}})</td>
109109
<td>{{device.ip}}</td>
110110
<td>{{device.id.substring(0,6)}}</td>
111111
<td>
112-
<center><input type="checkbox" ng-disabled="device.status != 'stopped'" checklist-model="selected_devices" checklist-value=">
112+
<center><input type="checkbox" ng-disabled="device.status != 'stopped' " checklist-model="selected_devices" checklist-value="device" ng-checked="device.selected" ng-click="updateSelection(device)"></center>
113113
</td>
114114
</tr>
115115
</tbody>
116116
</table>
117-
118-
119117
</div>
120118

121119
<!--Modal-->
122-
<div class=" modal fade" id="Modal" tabindex="-1" role="dialog" aria-labelledby="startModal" aria-hidden="true">
123-
<div class="modal-dialog">
124-
<div class="modal-content">
125-
<div class="modal-header">
126-
{{modal.title}}
127-
</div>
128-
<div class="model-body" ng-if="system.modal_error != ''">
129-
<h3>{{system.modal_error}}</h3>
130-
</div>
131-
132-
<div class="modal-body " ng-if="system.modal_error == ''">
133-
{{modal.info}}
134-
<select ng-show="modal.action=='swBranch'" name="branch_to_switch" ng-model="modal.branch_to_switch">
135-
<option ng-repeat="(key, name) in system.status" value="{{key}}">{{key}}</option>
136-
</select>
137-
<table class="table table-striped" ng-cloak>
138-
<thead>
139-
<th>Name</th>
140-
<th>Status</th>
141-
<th>Software Version</th>
142-
<th>ip</th>
143-
<th>id</th>
144-
</thead>
145-
<tbody>
146-
147-
<tr ng-repeat="(id,device) in selected_devices">
148-
149-
<td>
150-
<a ng-href="/#ethoscope/{{device.id}}" target="_blank">
151-
<span ng-if="device.up_to_date==false" class="fa fa-circle colour-red"></span> <span ng-if="device.up_to_date==true" class="fa fa-circle colour-green"></span>
152-
<span> {{device.name}}</span>
153-
</a>
154-
</td>
155-
<td> {{device.status}}</td>
156-
<td>[{{device.active_branch}}] {{device.version.id.substring(0,6)}}... ({{device.version.date}})</td>
157-
<td>{{device.ip}}</td>
158-
<td>{{device.id.substring(0,6)}}</td>
159-
</tr>
160-
</tbody>
161-
</table>
162-
</div>
163-
<div class="modal-footer">
164-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
165-
<button ng-click="modal_action(selected_devices, modal.action)" target="_blank" type="button" class="btn btn-primary" ng-if="system.modal_error == ''">{{modal.action_text}}</button>
166-
</div>
167-
</div>
168-
</div>
120+
<div class="modal fade" id="Modal" tabindex="-1" role="dialog" aria-labelledby="startModal" aria-hidden="true">
121+
<div class="modal-dialog">
122+
<div class="modal-content">
123+
<div class="modal-header">
124+
{{modal.title}}
125+
</div>
126+
<div class="model-body" ng-if="system.modal_error != ''">
127+
<h3>{{system.modal_error}}</h3>
128+
</div>
129+
130+
<div class="modal-body " ng-if="system.modal_error == ''">
131+
{{modal.info}}
132+
<select ng-show="modal.action=='swBranch'" name="branch_to_switch" ng-model="modal.branch_to_switch">
133+
<option ng-repeat="(key, name) in system.status" value="{{key}}">{{key}}</option>
134+
</select>
135+
<table class="table table-striped" ng-cloak>
136+
<thead>
137+
<th>Name</th>
138+
<th>Status</th>
139+
<th>Software Version</th>
140+
<th>ip</th>
141+
<th>id</th>
142+
</thead>
143+
<tbody>
144+
145+
<tr ng-repeat="(id,device) in selected_devices">
146+
147+
<td>
148+
<a ng-href="/#ethoscope/{{device.id}}" target="_blank">
149+
<span ng-if="device.up_to_date==false" class="fa fa-circle colour-red"></span> <span ng-if="device.up_to_date==true" class="fa fa-circle colour-green"></span>
150+
<span> {{device.name}}</span>
151+
</a>
152+
</td>
153+
<td> {{device.status}}</td>
154+
<td>[{{device.active_branch}}] {{device.version.id.substring(0,6)}}... ({{device.version.date}})</td>
155+
<td>{{device.ip}}</td>
156+
<td>{{device.id.substring(0,6)}}</td>
157+
</tr>
158+
</tbody>
159+
</table>
160+
</div>
161+
<div class="modal-footer">
162+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
163+
<button ng-click="modal_action(selected_devices, modal.action)" target="_blank" type="button" class="btn btn-primary" ng-if="system.modal_error == ''">{{modal.action_text}}</button>
164+
</div>
165+
</div>
166+
</div>
169167
</div>
170168

171169

0 commit comments

Comments
 (0)