openstack
/
octavia-dashboard
Code Issues Proposed changes

Merge "Use the horizon limit filter for connection limit"

This commit is contained in:
Jenkins 2016-02-22 19:07:31 +00:00 committed by Gerrit Code Review
parent 087d73cecc 68d0cde4f6
commit 73444f99f8
4 changed files with 2 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html
View File

@ -27,7 +27,7 @@
</div>
<div>
<dt translate>Connection Limit</dt>
<dd>{$ ::ctrl.listener.connection_limit | connectionLimit $}</dd>
<dd>{$ ::ctrl.listener.connection_limit | limit $}</dd>
</div>
<div>
<dt translate>Admin State Up</dt>

42
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.js
View File

@ -1,42 +0,0 @@
/*
* Copyright 2016 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the 'License');
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an 'AS IS' BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
(function () {
'use strict';
angular
.module('horizon.dashboard.project.lbaasv2.listeners')
.filter('connectionLimit', connectionLimitFilter);
connectionLimitFilter.$inject = [
'horizon.framework.util.i18n.gettext'
];
/**
* @ngdoc filter
* @name connectionLimitFilter
* @description
* Takes the raw listener connection limit from the API and returns 'Unlimited' if the
* default connection limit of -1 is returned.
* @returns The function for filtering the listener connection limit.
*/
function connectionLimitFilter(gettext) {
return function (input) {
return input === -1 ? gettext('Unlimited') : input;
};
}
}());

39
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/filters.spec.js
View File

@ -1,39 +0,0 @@
/*
* Copyright 2016 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the 'License');
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an 'AS IS' BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
(function() {
'use strict';
describe('LBaaS v2 Listeners Filters', function () {
beforeEach(module('horizon.framework.util.i18n'));
beforeEach(module('horizon.dashboard.project.lbaasv2.listeners'));
describe('connectionLimit', function () {
var connectionLimitFilter;
beforeEach(inject(function (_connectionLimitFilter_) {
connectionLimitFilter = _connectionLimitFilter_;
}));
it('Returns "Unlimited" when connection limit value is -1', function () {
expect(connectionLimitFilter(-1)).toBe('Unlimited');
});
it('Returns original connection limit when value is not -1', function () {
expect(connectionLimitFilter(100)).toBe(100);
});
});
});
})();

2
neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html
View File

@ -94,7 +94,7 @@
</dl>
<dl class="col-sm-2">
<dt translate>Connection Limit</dt>
<dd>{$ ::item.connection_limit | connectionLimit $}</dd>
<dd>{$ ::item.connection_limit | limit $}</dd>
</dl>
<dl class="col-sm-2">
<dt translate>Default Pool ID</dt>