Updated changelog

ChameleonCloud · Dec 20, 2016 · b63f487 · b63f487
1 parent 0db9628
commit b63f487
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+### v1.15.4
+- Enhancements:
+    - Changed filters to utilize node_type
+    - Added Chameleon citation terms dialog box
+
 ### v1.15.3
 - Fixes:
     - Fixed issue where complex appliance edits were rejected by the admin interface

diff --git a/g5k_discovery/templates/g5k_discovery/filters.html b/g5k_discovery/templates/g5k_discovery/filters.html
@@ -58,12 +58,14 @@ <h4 class="filter-state"><strong>[[filteredNodesOrg.length]] node<span ng-show="
             <div class="col col-sm-3">
                 <button type="button" class="btn btn-lg btn-primary btn-filter btn-block" ng-model="appliedFilters.node_type['fpga']" ng-change="applyFilter()" ng-disabled="shouldDisable(['node_type', 'fpga'], filters.node_type['fpga'].length)" btn-checkbox><i class="fa fa-check-square-o" ng-show="appliedFilters.node_type['fpga'] || filters.node_type['fpga'].length === filteredNodesOrg.length"></i> FPGA <span ng-show="filters.node_type['fpga'].length > 0">([[filters.node_type['fpga'].length]])</span></button>
             </div>
+            <!--
             <div class="col col-sm-3">
                 <button type="button" class="btn btn-lg btn-primary btn-filter btn-block" ng-model="appliedFilters.node_type['lowpower_xeon']" ng-change="applyFilter()" ng-disabled="shouldDisable(['node_type', 'lowpower_xeon'], filters.node_type['lowpower_xeon'].length)" btn-checkbox><i class="fa fa-check-square-o" ng-show="appliedFilters.node_type['lowpower_xeon'] || filters.node_type['lowpower_xeon'].length === filteredNodesOrg.length"></i> Low Power Xeon <span ng-show="filters.node_type['lowpower_xeon'].length > 0">([[filters.node_type['lowpower_xeon'].length]])</span></button>
             </div>
             <div class="col col-sm-3">
                 <button type="button" class="btn btn-lg btn-primary btn-filter btn-block" ng-model="appliedFilters.node_type['atom']" ng-change="applyFilter()" ng-disabled="shouldDisable(['node_type', 'atom'], filters.node_type['atom'].length)" btn-checkbox><i class="fa fa-check-square-o" ng-show="appliedFilters.node_type['atom'] || filters.node_type['atom'].length === filteredNodesOrg.length"></i> Atom <span ng-show="filters.node_type['atom'].length > 0">([[filters.node_type['atom'].length]])</span></button>
             </div>
+            -->
         </div>
         <div class="row">
             <div class="col col-sm-2 filter-block">