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

fix(ui): kubernetes create from file page - fix template load failed message style [R8S-68] (#95)

pull/12292/merge
Malcolm Lockyer 2024-11-11 12:06:56 +13:00 committed by GitHub
parent cd8c6d1ce0
commit fd2b00bf3b
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/kubernetes/views/deploy/deploy.html
View File

@ -132,22 +132,10 @@
definitions="ctrl.state.template.Variables" definitions="ctrl.state.template.Variables"
value="ctrl.formValues.Variables" value="ctrl.formValues.Variables"
on-change="(ctrl.onChangeTemplateVariables)" on-change="(ctrl.onChangeTemplateVariables)"
is-load-failed="ctrl.state.BuildMethod === ctrl.BuildMethods.CUSTOM_TEMPLATE && ctrl.state.templateId && ctrl.state.templateLoadFailed"
></custom-templates-variables-field> ></custom-templates-variables-field>
</div> </div>
<span ng-if="ctrl.state.BuildMethod === ctrl.BuildMethods.CUSTOM_TEMPLATE && ctrl.state.templateId && ctrl.state.templateLoadFailed" class="row">
<span class="col-sm-offset-3 col-lg-offset-2 col-sm-8">
<p class="small vertical-center text-danger mb-5" ng-if="ctrl.currentUser.isAdmin || ctrl.currentUser.id === ctrl.state.template.CreatedByUserId">
<pr-icon icon="'alert-triangle'" mode="'danger'" size="'md'" feather="true"></pr-icon>Custom template could not be loaded, please
<a ui-sref="kubernetes.templates.custom.edit({id: ctrl.state.templateId})">click here</a> for configuration.</p
>
<p class="small vertical-center text-danger mb-5" ng-if="!(ctrl.currentUser.isAdmin || ctrl.currentUser.id === ctrl.state.template.CreatedByUserId)">
<pr-icon icon="'alert-triangle'" mode="'danger'" size="'md'" feather="true"></pr-icon>Custom template could not be loaded, please contact your
administrator.</p
>
</span>
</span>
<!-- editor --> <!-- editor -->
<div class="mt-4"> <div class="mt-4">
<web-editor-form <web-editor-form

9
app/portainer/components/custom-template-selector/custom-template-selector.html
View File

@ -12,6 +12,15 @@
> >
<option value="" label="Select a Custom template" disabled selected="selected"> </option> <option value="" label="Select a Custom template" disabled selected="selected"> </option>
</select> </select>
<span ng-if="$ctrl.isLoadFailed">
<p class="text-warning mb-5 !inline-flex gap-1 !align-top text-xs" ng-if="ctrl.currentUser.isAdmin || ctrl.currentUser.id === ctrl.state.template.CreatedByUserId">
<pr-icon icon="'alert-triangle'" mode="'warning'" size="'sm'"></pr-icon>Custom template could not be loaded, please
<a ui-sref="kubernetes.templates.custom.edit({id: ctrl.state.templateId})">click here</a> for configuration.</p
>
<p class="text-warning mb-5 !inline-flex gap-1 !align-top text-xs" ng-if="!(ctrl.currentUser.isAdmin || ctrl.currentUser.id === ctrl.state.template.CreatedByUserId)">
<pr-icon icon="'alert-triangle'" mode="'warning'" size="'sm'"></pr-icon>Custom template could not be loaded, please contact your administrator.</p
>
</span>
<span class="small text-muted pt-[7px]" ng-if="!$ctrl.templates.length"> <span class="small text-muted pt-[7px]" ng-if="!$ctrl.templates.length">
No custom templates are available. Head over to the <a ui-state="$ctrl.newTemplatePath">custom template view</a> to create one. No custom templates are available. Head over to the <a ui-state="$ctrl.newTemplatePath">custom template view</a> to create one.
</span> </span>

1
app/portainer/components/custom-template-selector/index.js
View File

@ -7,6 +7,7 @@ export const customTemplateSelector = {
bindings: { bindings: {
newTemplatePath: '@', newTemplatePath: '@',
stackType: '<', stackType: '<',
isLoadFailed: '<',
value: '<', value: '<',
onChange: '<', onChange: '<',