github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

revert(images): revert image autocompletion (#1367)

pull/1186/merge
Anthony Lapenna 2017-11-08 08:18:52 +01:00 committed by GitHub
parent d06667218f
commit 6c6171c1f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/createContainer/createcontainer.html
View File

@ -28,7 +28,7 @@
<div ng-if="formValues.Registry || !fromContainer"> <div ng-if="formValues.Registry || !fromContainer">
<!-- image-and-registry --> <!-- image-and-registry -->
<div class="form-group"> <div class="form-group">
<por-image-registry image="config.Image" registry="formValues.Registry" ng-if="formValues.Registry" auto-complete="true"></por-image-registry> <por-image-registry image="config.Image" registry="formValues.Registry" ng-if="formValues.Registry"></por-image-registry>
</div> </div>
<!-- !image-and-registry --> <!-- !image-and-registry -->
<!-- always-pull --> <!-- always-pull -->

2
app/components/createService/createservice.html
View File

@ -25,7 +25,7 @@
</div> </div>
<!-- image-and-registry --> <!-- image-and-registry -->
<div class="form-group"> <div class="form-group">
<por-image-registry image="formValues.Image" registry="formValues.Registry" auto-complete="true"></por-image-registry> <por-image-registry image="formValues.Image" registry="formValues.Registry"></por-image-registry>
</div> </div>
<!-- !image-and-registry --> <!-- !image-and-registry -->
<div class="col-sm-12 form-section-title"> <div class="col-sm-12 form-section-title">

3
app/directives/imageRegistry/por-image-registry.js
View File

@ -3,7 +3,6 @@ angular.module('portainer').component('porImageRegistry', {
controller: 'porImageRegistryController', controller: 'porImageRegistryController',
bindings: { bindings: {
'image': '=', 'image': '=',
'registry': '=', 'registry': '='
'autoComplete': '<'
} }
}); });

4
app/directives/imageRegistry/porImageRegistry.html
View File

@ -1,9 +1,7 @@
<div> <div>
<label for="image_name" class="col-sm-1 control-label text-left">Name</label> <label for="image_name" class="col-sm-1 control-label text-left">Name</label>
<div class="col-sm-11 col-md-6"> <div class="col-sm-11 col-md-6">
<input type="text" class="form-control" <input type="text" class="form-control" ng-model="$ctrl.image" id="image_name" placeholder="e.g. myImage:myTag">
uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5"
ng-model="$ctrl.image" id="image_name" placeholder="e.g. myImage:myTag">
</div> </div>
<label for="image_registry" class="col-sm-2 col-md-1 margin-sm-top control-label text-left"> <label for="image_registry" class="col-sm-2 col-md-1 margin-sm-top control-label text-left">
Registry Registry

13
app/directives/imageRegistry/porImageRegistryController.js
View File

@ -1,21 +1,16 @@
angular.module('portainer') angular.module('portainer')
.controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'ImageService', 'Notifications', .controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'Notifications',
function ($q, RegistryService, DockerHubService, ImageService, Notifications) { function ($q, RegistryService, DockerHubService, Notifications) {
var ctrl = this; var ctrl = this;
ctrl.availableImages = [];
function initComponent() { function initComponent() {
$q.all({ $q.all({
registries: RegistryService.registries(), registries: RegistryService.registries(),
dockerhub: DockerHubService.dockerhub(), dockerhub: DockerHubService.dockerhub()
availableImages: ctrl.autoComplete ? ImageService.images() : []
}) })
.then(function success(data) { .then(function success(data) {
var dockerhub = data.dockerhub; var dockerhub = data.dockerhub;
var registries = data.registries; var registries = data.registries;
ctrl.availableImages = _.flatten(_.map(data.availableImages, function (image) {
return image.RepoTags ? image.RepoTags : [];
}));
ctrl.availableRegistries = [dockerhub].concat(registries); ctrl.availableRegistries = [dockerhub].concat(registries);
if (!ctrl.registry.Id) { if (!ctrl.registry.Id) {
ctrl.registry = dockerhub; ctrl.registry = dockerhub;