openstack
/
horizon
Code Issues Proposed changes

Merge "Update Metadata Widget to angular 1.3.7"

This commit is contained in:
Jenkins 2015-01-19 22:53:28 +00:00 committed by Gerrit Code Review
parent 29bdd0d4bf 242943f3a8
commit f494dd358c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
horizon/static/horizon/js/angular/controllers/metadata-widget-controller.js vendored
View File

@ -255,7 +255,7 @@
$scope.saveMetadata = function () {
var metadata = [];
var added = filter($scope.flatTree, {'added': true, 'leaf': '!!'});
var added = filter($scope.flatTree, {'added': true, 'leaf': '!null'});
angular.forEach(added, function(item) {
metadata.push({
key: item.leaf.name,
@ -289,7 +289,10 @@
valid: false,
found: []
};
$scope.filterText = {
available: '',
existing: ''
};
loadExisting($scope.flatTree, $window.existing_metadata);
}]);

11
horizon/templates/horizon/common/_modal_form_update_metadata.html
View File

@ -26,7 +26,7 @@
<strong>{% trans "Available Metadata" %}</strong>
<input class="form-control input-sm"
type="text" placeholder="{% trans "Filter" %}"
ng-model="treeFilter"/>
ng-model="filterText.available"/>
<span class="fa fa-search form-control-feedback">
</span>
</div>
@ -56,8 +56,7 @@
{% trans "Duplicate keys are not allowed" %}
</span>
</li>
<li ng-repeat="item in available = (flatTree | filter: {$: treeFilter, visible: true, added: false})"
<li ng-repeat="item in available = (flatTree | filter: {$: filterText.available, visible: true, added: false})"
ng-class="'level-' + item.level + (selected===item?' active':'')"
ng-class-odd="'dark-stripe'"
ng-class-even="'light-stripe'"
@ -96,14 +95,14 @@
<strong>{% trans "Existing Metadata" %}</strong>
<input class="form-control input-sm"
type="text" placeholder="{% trans "Filter" %}"
ng-model="listFilter"/>
ng-model="filterText.existing"/>
<span class="fa fa-search form-control-feedback">
</span>
</div>
</div>
</div>
<ul class="list-group" ng-cloak>
<li ng-repeat="item in existing = (flatTree | filter:{$:listFilter, added:true, leaf:'!!'} | orderBy:'leaf.name')"
<li ng-repeat="item in existing = (flatTree | filter:{$:filterText.existing, added:true, leaf:'!null'} | orderBy:'leaf.name')"
ng-class="{'active': selected===item}"
ng-class-odd="'dark-stripe'"
ng-class-even="'light-stripe'"
@ -124,9 +123,9 @@
name="property"
type="text"
class="form-control"
pattern="{$ item.leaf.pattern $}"
ng-required=true
ng-model="item.leaf.value"
ng-pattern="/{$ item.leaf.pattern $}/"
ng-minlength="{$ item.leaf.minLength $}"
ng-maxlength="{$ item.leaf.maxLength $}"
tooltip="{$ item.description $}"/>