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

update object has changed

Browse Source 
part of cloudron/box#749
This commit is contained in:
Girish Ramakrishnan
2020-12-21 12:49:21 -08:00
parent 94040cf3f9
commit de5c1ca1cf
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/app.html
View File

@@ -270,22 +270,22 @@
<h4 class="modal-title">{{ 'app.updateDialog.title' | tr:{ app: app.fqdn } }}</h4>
</div>
<div class="modal-body">
<p class="text-danger" ng-show="config.update.apps[app.id].unstable">{{ 'app.updateDialog.unstableWarning' | tr }}</p>
<p>{{ 'app.updateDialog.changelogHeader' | tr:{ version: config.update.apps[app.id].manifest.version } }}</p>
<div ng-bind-html="config.update.apps[app.id].manifest.changelog | markdown2html"></div>
<p class="text-danger text-bold" ng-show="!config.update.apps[app.id].manifest.dockerImage">
<p class="text-danger" ng-show="config.update[app.id].unstable">{{ 'app.updateDialog.unstableWarning' | tr }}</p>
<p>{{ 'app.updateDialog.changelogHeader' | tr:{ version: config.update[app.id].manifest.version } }}</p>
<div ng-bind-html="config.update[app.id].manifest.changelog | markdown2html"></div>
<p class="text-danger text-bold" ng-show="!config.update[app.id].manifest.dockerImage">
<br/>
{{ 'app.updateDialog.subscriptionExpired' | tr }}
</p>
</div>
<div class="modal-footer">
<label class="checkbox-inline pull-left" ng-show="config.update.apps[app.id].manifest.dockerImage">
<label class="checkbox-inline pull-left" ng-show="config.update[app.id].manifest.dockerImage">
<input type="checkbox" ng-model="updates.skipBackup"><b>{{ 'app.updateDialog.skipBackupCheckbox' | tr }}</b>
</label>
<button type="button" class="btn btn-primary pull-left" ng-show="!config.update.apps[app.id].manifest.dockerImage && user.isAtLeastOwner" ng-click="openSubscriptionSetup()">{{ 'app.updateDialog.setupSubscriptionAction' | tr }}</button>
<button type="button" class="btn btn-primary pull-left" ng-show="!config.update[app.id].manifest.dockerImage && user.isAtLeastOwner" ng-click="openSubscriptionSetup()">{{ 'app.updateDialog.setupSubscriptionAction' | tr }}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
<button type="button" ng-class="config.update.apps[app.id].unstable ? 'btn btn-danger' : 'btn btn-success'" ng-click="updates.confirmUpdate()" ng-disabled="!config.update.apps[app.id].manifest.dockerImage || updates.busyUpdate"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyUpdate"></i> {{ 'app.updateDialog.updateAction' | tr }}</button>
<button type="button" ng-class="config.update[app.id].unstable ? 'btn btn-danger' : 'btn btn-success'" ng-click="updates.confirmUpdate()" ng-disabled="!config.update[app.id].manifest.dockerImage || updates.busyUpdate"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyUpdate"></i> {{ 'app.updateDialog.updateAction' | tr }}</button>
</div>
</div>
</div>
@@ -912,11 +912,11 @@
<br/>
<div class="row">
<div class="col-md-12" ng-show="!config.update.apps[app.id].manifest.version || config.update.apps[app.id].manifest.version === app.manifest.version">
<div class="col-md-12" ng-show="!config.update[app.id].manifest.version || config.update[app.id].manifest.version === app.manifest.version">
<button class="btn btn-primary pull-right" ng-show="app.appStoreId" ng-click="updates.check()" ng-disabled="updates.busyCheck"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyCheck"></i> {{ 'app.updates.info.checkForUpdatesAction' | tr }}</button>
<span ng-show="!app.appStoreId" class="text-danger pull-right">{{ 'app.updates.info.customAppUpdateInfo' | tr }}</span>
</div>
<div class="col-md-12" ng-show="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version && app.installationState !== 'pending_update'">
<div class="col-md-12" ng-show="config.update[app.id].manifest.version && config.update[app.id].manifest.version !== app.manifest.version && app.installationState !== 'pending_update'">
<button type="button" class="btn btn-success pull-right" ng-click="updates.askUpdate()" ng-disabled="app.taskId || app.error || app.runState === 'stopped'" tooltip-enable="app.error || app.taskId || app.runState === 'stopped'" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is not running' }}">{{ 'app.updates.info.updateAvailableAction' | tr }}</button>
</div>
</div>