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

fix(templates): fix an issue preventing linuxserver.io templates to be displayed (#1426)

pull/1431/head
Anthony Lapenna 2017-11-22 22:16:53 +01:00 committed by GitHub
parent 547511c8aa
commit 4ab580923f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/components/templates/templates.html
View File

@ -356,8 +356,8 @@
<div class="form-group" style="margin-bottom: 0"> <div class="form-group" style="margin-bottom: 0">
<div class="boxselector_wrapper"> <div class="boxselector_wrapper">
<div ng-click="updateCategories(templates, state.filters.Type)"> <div ng-click="updateCategories(templates, state.filters.Type)">
<input type="radio" id="registry_quay" ng-model="state.filters.Type" value="stack"> <input type="radio" id="template_stack" ng-model="state.filters.Type" value="stack">
<label for="registry_quay"> <label for="template_stack">
<div class="boxselector_header"> <div class="boxselector_header">
<i class="fa fa-th-list" aria-hidden="true" style="margin-right: 2px;"></i> <i class="fa fa-th-list" aria-hidden="true" style="margin-right: 2px;"></i>
Stack Stack
@ -366,8 +366,8 @@
</label> </label>
</div> </div>
<div ng-click="updateCategories(templates, state.filters.Type)"> <div ng-click="updateCategories(templates, state.filters.Type)">
<input type="radio" id="registry_custom" ng-model="state.filters.Type" value="container"> <input type="radio" id="template_container" ng-model="state.filters.Type" value="container">
<label for="registry_custom"> <label for="template_container">
<div class="boxselector_header"> <div class="boxselector_header">
<i class="fa fa-server" aria-hidden="true" style="margin-right: 2px;"></i> <i class="fa fa-server" aria-hidden="true" style="margin-right: 2px;"></i>
Container Container

3
app/components/templates/templatesController.js
View File

@ -246,7 +246,8 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer
var endpointMode = $scope.applicationState.endpoint.mode; var endpointMode = $scope.applicationState.endpoint.mode;
var apiVersion = $scope.applicationState.endpoint.apiVersion; var apiVersion = $scope.applicationState.endpoint.apiVersion;
if (endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' && apiVersion >= 1.25) { if (templatesKey !== 'linuxserver.io'
&& endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' && apiVersion >= 1.25) {
$scope.state.filters.Type = 'stack'; $scope.state.filters.Type = 'stack';
$scope.state.showDeploymentSelector = true; $scope.state.showDeploymentSelector = true;
} }

1
app/models/api/templateLinuxServer.js
View File

@ -1,4 +1,5 @@
function TemplateLSIOViewModel(data) { function TemplateLSIOViewModel(data) {
this.Type = data.type;
this.Title = data.title; this.Title = data.title;
this.Note = data.description; this.Note = data.description;
this.Categories = data.category ? data.category : []; this.Categories = data.category ? data.category : [];