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

Inbox: Fix error when deleting, add ability to set custom ID (#775) 

Fixes #744.
Closes #474.

Signed-off-by: Yannick Schaus <github@schaus.net>
3.0.x
Yannick Schaus 2021-01-08 21:49:01 +01:00
parent 5a6f47f33e
commit dda747fd26
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bundles/org.openhab.ui/web/src/pages/settings/things/inbox/inbox-list.vue
View File

@ -235,6 +235,26 @@ export default {
entry.label)
}
},
{
text: 'Add as Thing (with custom ID)',
color: 'blue',
bold: true,
onClick: () => {
this.$f7.dialog.prompt(`This will create a new Thing of type ${entry.thingTypeUID}. You can change the suggested thing ID below:`,
'Add as Thing',
(newThingId) => {
this.$f7.dialog.prompt(`Enter the desired name of the new Thing:`,
'Add as Thing',
(name) => {
this.approveEntry(entry, name, newThingId)
},
null,
entry.label)
},
null,
entry.thingUID.substring(entry.thingUID.indexOf(':', entry.thingUID.indexOf(':') + 1) + 1))
}
},
{
text: (!ignored) ? 'Ignore' : 'Unignore',
color: (!ignored) ? 'orange' : 'blue',
@ -263,8 +283,8 @@ export default {
actions.open()
},
approveEntry (entry, name) {
this.$oh.api.postPlain(`/rest/inbox/${entry.thingUID}/approve`, name).then((res) => {
approveEntry (entry, name, newThingId) {
this.$oh.api.postPlain(`/rest/inbox/${entry.thingUID}/approve${newThingId ? '?newThingId=' + newThingId : ''}`, name).then((res) => {
this.$f7.toast.create({
text: 'Entry approved',
destroyOnClose: true,
@ -321,14 +341,14 @@ export default {
destroyOnClose: true,
closeTimeout: 2000
}).open()
self.load()
this.load()
}).catch((err) => {
this.$f7.toast.create({
text: 'Error while removing entry: ' + err,
destroyOnClose: true,
closeTimeout: 2000
}).open()
self.load()
this.load()
})
},
toggleIgnored () {