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

Script Editor: Fix script loading (#2442) 

Regression from #2374

The problem is when I clicked on a file-based script in the UI, the
content of the script didn't load.

Before:
<img width="601" alt="image"
src="https://github.com/openhab/openhab-webui/assets/2554958/b3351f27-8ae6-4463-91ee-583fce0cf873">


After:
<img width="670" alt="image"
src="https://github.com/openhab/openhab-webui/assets/2554958/596629cb-459d-43c0-992e-7221e2a505dd">

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
pull/2445/head
jimtng 2024-03-03 22:03:44 +10:00 committed by GitHub
parent e7faba6c9f
commit 0f343f3ca1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
View File

@ -248,8 +248,6 @@ export default {
// handle script action module type, label, description ect.
currentModule: {
handler: function () {
console.log('Running')
if (this.savedCurrentModule && !this.loading) { // ignore changes during loading
this.currentModuleDirty = !fastDeepEqual(this.currentModule, this.savedCurrentModule)
}
@ -386,11 +384,7 @@ export default {
if (this.moduleId) {
this.$set(this, 'currentModule', this.rule.actions.concat(this.rule.conditions).find((m) => m.id === this.moduleId))
} else {
let mod = this.rule.actions.find((m) => m.id === 'script')
if (!this.currentModule) {
mod = this.rule.actions.find((m) => m.configuration.script)
}
this.$set(this, 'currentModule', mod)
this.$set(this, 'currentModule', this.rule.actions.find((m) => m.id === 'script' || m.configuration.script))
this.isScriptRule = true
}