OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement link editable flag (#1029) 

Related to & closes #903, #693, #413. 

Signed-off-by: Hubert Nusser <hubsif@gmx.de>
pull/1036/head
hubsif 2021-04-30 00:15:00 +02:00 committed by GitHub
parent 7c8e787583
commit 3a78b4f352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.ui/web/src/components/model/link-details.vue
View File

@ -7,8 +7,9 @@
:title="l.thing.label" :subtitle="l.channel.label || '?'" :footer="l.link.channelUID" :title="l.thing.label" :subtitle="l.channel.label || '?'" :footer="l.link.channelUID"
:badge="thingStatusBadgeText(l.thing.statusInfo)" :badge="thingStatusBadgeText(l.thing.statusInfo)"
:badge-color="thingStatusBadgeColor(l.thing.statusInfo)" :badge-color="thingStatusBadgeColor(l.thing.statusInfo)"
link="#" @click="editLink(l)"> :link="!l.link.editable && l._invalid ? undefined : '#'" @click="!l.link.editable && l._invalid ? undefined : editLink(l)">
<span slot="media" class="item-initial">{{ !l._invalid && l.channel.label ? l.channel.label[0] : '?' }}</span> <span slot="media" class="item-initial">{{ !l._invalid && l.channel.label ? l.channel.label[0] : '?' }}</span>
<f7-icon v-if="!l.link.editable" slot="title" f7="lock_fill" size="1rem" color="gray" />
</f7-list-item> </f7-list-item>
</ul> </ul>
</f7-list> </f7-list>

15
bundles/org.openhab.ui/web/src/pages/settings/things/link/link-edit.vue
View File

@ -1,12 +1,13 @@
<template> <template>
<f7-page @page:beforein="onPageBeforeIn" @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut"> <f7-page @page:beforein="onPageBeforeIn" @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
<f7-navbar :title="item.label || item.name" :subtitle="thing.label" back-link="Cancel"> <f7-navbar :title="item.label || item.name" :subtitle="thing.label" back-link="Cancel">
<f7-nav-right> <f7-nav-right v-if="link.editable">
<f7-link @click="save()" v-if="$theme.md" icon-md="material:save" icon-only /> <f7-link @click="save()" v-if="$theme.md" icon-md="material:save" icon-only />
<f7-link @click="save()" v-if="!$theme.md"> <f7-link @click="save()" v-if="!$theme.md">
Save Save
</f7-link> </f7-link>
</f7-nav-right> </f7-nav-right>
<f7-link v-else slot="right" icon-f7="lock_fill" icon-only tooltip="links defined in a .items file are not editable from this screen" />
</f7-navbar> </f7-navbar>
<f7-block class="block-narrow"> <f7-block class="block-narrow">
<f7-col> <f7-col>
@ -33,12 +34,12 @@
</ul> </ul>
</f7-list> </f7-list>
</f7-card-content> </f7-card-content>
<f7-card-footer v-if="item"> <f7-card-footer v-if="item && (item.editable || link.editable)">
<f7-button color="red" fill @click="unlinkAndDelete()" v-if="source === 'thing' && item.editable"> <f7-button color="red" fill @click="unlinkAndDelete()" v-if="source === 'thing' && item.editable">
Unlink &amp; Remove Item Unlink &amp; Remove Item
</f7-button> </f7-button>
<f7-button color="red" @click="unlink()"> <f7-button color="red" @click="unlink()" v-if="link.editable">
{{ source === 'thing' && item.editable ? 'Unlink Only' : 'Unlink' }} {{ source === 'thing' && link.editable ? 'Unlink Only' : 'Unlink' }}
</f7-button> </f7-button>
</f7-card-footer> </f7-card-footer>
</f7-card> </f7-card>
@ -55,9 +56,10 @@
<div>Loading...</div> <div>Loading...</div>
</f7-block> </f7-block>
<f7-list v-else> <f7-list v-else>
<f7-list-item radio :checked="!currentProfileType" value="" @change="onProfileTypeChange()" title="(No Profile)" name="profile-type" /> <f7-list-item radio :checked="!currentProfileType" value="" @change="onProfileTypeChange()" title="(No Profile)" name="profile-type" :disabled="!link.editable" />
<f7-list-item radio v-for="profileType in profileTypes" <f7-list-item radio v-for="profileType in profileTypes"
:checked="currentProfileType && profileType.uid === currentProfileType.uid" :checked="currentProfileType && profileType.uid === currentProfileType.uid"
:disabled="!link.editable"
@change="onProfileTypeChange(profileType.uid)" @change="onProfileTypeChange(profileType.uid)"
:key="profileType.uid" :title="profileType.label" name="profile-type" /> :key="profileType.uid" :title="profileType.label" name="profile-type" />
</f7-list> </f7-list>
@ -68,7 +70,8 @@
<config-sheet ref="profileConfiguration" <config-sheet ref="profileConfiguration"
:parameter-groups="profileTypeConfiguration.parameterGroups" :parameter-groups="profileTypeConfiguration.parameterGroups"
:parameters="profileTypeConfiguration.parameters" :parameters="profileTypeConfiguration.parameters"
:configuration="link.configuration" /> :configuration="link.configuration"
:read-only="!link.editable" />
</f7-col> </f7-col>
</f7-block> </f7-block>
</f7-page> </f7-page>