jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move app error handling to simply show the app configure view

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-18 15:54:19 +02:00
parent 14dd1103eb
commit 300ff09a47
3 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/apps.html
View File

@@ -30,25 +30,6 @@
</div>
</div>
<!-- Modal error app -->
<div class="modal fade" id="appErrorModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Error for {{ appError.app.fqdn }}</h4>
</div>
<div class="modal-body">
<p>{{ appError.app | prettyAppErrorMessage }}</p>
</div>
<div class="modal-footer">
<a type="button" class="btn btn-primary pull-left" ng-href="{{ '/#/app/' + appError.app.id }}" autofocus>Repair</a>
<a type="button" class="btn btn-default pull-left" ng-href="{{ '/logs.html?appId=' + appError.app.id }}" target="_blank">Logs</a>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<!-- Modal update app -->
<div class="modal fade" id="appUpdateModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
@@ -113,7 +94,7 @@
<div class="animateMeOpacity ng-hide" ng-show="installedApps.length > 0">
<div class="app-grid">
<div class="grid-item" ng-repeat="app in installedApps | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | orderBy:'location'">
<a ng-href="{{ app | applicationLink }}" ng-click="user.admin && ((app | installError) === true && appError.show(app)) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) }">
<a ng-href="{{ app | applicationLink }}" ng-click="user.admin && ((app | installError) === true && showAppDebug(app)) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) }">
<div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
<div class="grid-item-top">
<div class="row">