Skip to content

separate normal update and branch/tag switch #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benderl merged 1 commit into from
Sep 27, 2022
Merged

separate normal update and branch/tag switch #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 46 additions & 28 deletions src/views/System.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,39 +102,15 @@
<form name="updateForm">
<openwb-base-card
title="Aktualisierung"
subtype="success"
:collapsible="true"
:collapsed="true"
>
<openwb-base-alert subtype="danger">
Nach einem Update wird die Ladestation direkt neu
gestartet!
gestartet! Es werden alle lokalen Änderungen mit dem
Update verworfen!
</openwb-base-alert>
<openwb-base-alert subtype="warning">
<p>
Es werden alle lokalen Änderungen mit dem Update
verworfen!
</p>
ToDo:
<ul>
<li>allow branch selection</li>
<li>allow tag selection (no downgrade!)</li>
</ul>
</openwb-base-alert>
<openwb-base-select-input
title="Entwicklungszweig"
:options="getBranchOptions()"
:model-value="
$store.state.mqtt['openWB/system/current_branch']
"
@update:model-value="
updateState('openWB/system/current_branch', $event)
"
/>
<openwb-base-select-input
title="Tag"
:options="getBranchTagOptions()"
v-model="selectedTag"
/>
<template #footer>
<div class="row justify-content-center">
<div
Expand All @@ -152,7 +128,7 @@
branch: $store.state.mqtt[
'openWB/system/current_branch'
],
tag: selectedTag,
tag: '*HEAD*',
})
"
>
Expand All @@ -163,6 +139,48 @@
/>
</openwb-base-click-button>
</div>
</div>
</template>
</openwb-base-card>
</form>
<form name="releaseChangeForm">
<openwb-base-card
title="Entwicklungszweig"
subtype="danger"
:collapsible="true"
:collapsed="true"
>
<openwb-base-alert subtype="danger">
Nach einem Wechsel wird die Ladestation direkt neu
gestartet! Es werden alle lokalen Änderungen mit dem
Wechsel verworfen!
</openwb-base-alert>
<openwb-base-alert subtype="warning">
Das ist eine experimentelle Option! Verwendung auf
eigene Gefahr. Im schlimmsten Fall muss das system neu
installiert werden!<br />
ToDo:
<ul>
<li>do not allow downgrade</li>
</ul>
</openwb-base-alert>
<openwb-base-select-input
title="Entwicklungszweig"
:options="getBranchOptions()"
:model-value="
$store.state.mqtt['openWB/system/current_branch']
"
@update:model-value="
updateState('openWB/system/current_branch', $event)
"
/>
<openwb-base-select-input
title="Tag"
:options="getBranchTagOptions()"
v-model="selectedTag"
/>
<template #footer>
<div class="row justify-content-center">
<div
class="col-md-4 d-flex py-1 justify-content-center"
>
Expand Down