Show app update changelog in update view instead of dialog
This commit is contained in:
@@ -116,13 +116,6 @@ onMounted(async () => {
|
||||
@alternate="onSetupSubscription()"
|
||||
>
|
||||
<div>
|
||||
<div class="error-label" v-if="!update.manifest.dockerImage">{{ $t('app.updateDialog.subscriptionExpired') }}</div>
|
||||
<div class="error-label" v-if="updateError">{{ updateError }}</div>
|
||||
|
||||
<p class="text-danger" v-if="update.unstable">{{ $t('app.updateDialog.unstableWarning') }}</p>
|
||||
<p>{{ $t('app.updateDialog.changelogHeader', { version: update.manifest.version }) }}</p>
|
||||
<div v-html="marked.parse(update.manifest.changelog)"></div>
|
||||
|
||||
<Checkbox v-if="update.manifest.dockerImage" v-model="skipBackup" :label="$t('app.updateDialog.skipBackupCheckbox')" />
|
||||
</div>
|
||||
</Dialog>
|
||||
@@ -145,10 +138,20 @@ onMounted(async () => {
|
||||
<Button v-if="app.appStoreId" @click="onCheck()" :disabled="busyCheck" :loading="busyCheck">{{ $t('settings.updates.checkForUpdatesAction') }}</Button>
|
||||
</SettingsItem>
|
||||
|
||||
<div style="display: flex; gap: 6px; margin-top: 20px">
|
||||
<SettingsItem v-if="update" style="padding: 10px;">
|
||||
<div>
|
||||
<label>{{ $t('settings.updates.updateAvailableAction') }}</label>
|
||||
<div class="error-label" v-if="!update.manifest.dockerImage">{{ $t('app.updateDialog.subscriptionExpired') }}</div>
|
||||
<div class="error-label" v-if="updateError">{{ updateError }}</div>
|
||||
|
||||
<div class="text-danger" v-if="update.unstable">{{ $t('app.updateDialog.unstableWarning') }}</div>
|
||||
|
||||
<p>{{ $t('app.updateDialog.changelogHeader', { version: update.manifest.version }) }}</p>
|
||||
<div v-html="marked.parse(update.manifest.changelog)"></div>
|
||||
</div>
|
||||
|
||||
<!-- show update button only if update available -->
|
||||
<Button v-if="update" :danger="update.unstable ? true : null" :success="update.unstable ? null : true" @click="onAskUpdate()" :disabled="app.taskId || app.error || app.runState === 'stopped' || app.installationState === 'pending_update'" v-tooltip="(app.error || app.taskId || app.runState === 'stopped') ? (app.error ? 'App is in error state' : 'App is not running') : ''">{{ $t('app.updateDialog.updateAction') }}</Button>
|
||||
</div>
|
||||
</SettingsItem>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user