Skip to content

Commit 04eb99b

Browse files
jimtngjimtng
committed
Rename copy to duplicate
Signed-off-by: Jimmy Tanagra <[email protected]>
1 parent debe182 commit 04eb99b

File tree

9 files changed

+41
-37
lines changed

9 files changed

+41
-37
lines changed

‎bundles/org.openhab.ui/web/src/components/pagedesigner/page-settings.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<tag-input :item="page" />
3737
</f7-list>
3838
<f7-list v-if="!createMode" inline-labels no-hairline-md>
39-
<f7-list-button color="blue" @click="copyPage">
40-
Copy Page
39+
<f7-list-button color="blue" @click="duplicatePage">
40+
Duplicate Page
4141
</f7-list-button>
4242
<f7-list-button color="red" @click="deletePage">
4343
Remove Page
@@ -76,7 +76,7 @@ export default {
7676
}).open()
7777
}
7878
},
79-
copyPage () {
79+
duplicatePage () {
8080
const pageClone = cloneDeep(this.page)
8181
const pageType = pageClone.component.replace(/^oh-|-page$/g, '')
8282
pageClone.uid = pageClone.uid + '_copy'

‎bundles/org.openhab.ui/web/src/components/thing/channel-link.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<f7-icon slot="media" color="green" aurora="f7:plus_circle_fill" ios="f7:plus_circle_fill" md="material:control_point" />
4545
</f7-list-item>
4646
<f7-list-button class="searchbar-ignore" color="blue" :title="thing.editable && (channelType.parameterGroups.length || channelType.parameters.length) ? 'Configure Channel' : 'Channel Details'" @click="configureChannel()" />
47-
<f7-list-button class="searchbar-ignore" v-if="extensible && thing.editable" color="blue" title="Copy Channel" @click="copyChannel()" />
47+
<f7-list-button class="searchbar-ignore" v-if="extensible && thing.editable" color="blue" title="Duplicate Channel" @click="duplicateChannel()" />
4848
<f7-list-button class="searchbar-ignore" v-if="extensible && thing.editable" color="red" title="Remove Channel" @click="removeChannel()" />
4949
</f7-list>
5050
</template>
@@ -62,7 +62,7 @@
6262
import AddLinkPage from '@/pages/settings/things/link/link-add.vue'
6363
import ConfigureLinkPage from '@/pages/settings/things/link/link-edit.vue'
6464
import ConfigureChannelPage from '@/pages/settings/things/channel/channel-edit.vue'
65-
import CopyChannelPage from '@/pages/settings/things/channel/channel-copy.vue'
65+
import DuplicateChannelPage from '@/pages/settings/things/channel/channel-duplicate.vue'
6666
6767
import ItemMixin from '@/components/item/item-mixin'
6868
@@ -177,16 +177,16 @@ export default {
177177
}
178178
})
179179
},
180-
copyChannel () {
180+
duplicateChannel () {
181181
const self = this
182182
const path = 'channels/' + this.channelId + '/edit'
183183
this.$f7router.navigate({
184184
url: path,
185185
route: {
186-
component: CopyChannelPage,
186+
component: DuplicateChannelPage,
187187
path,
188188
context: {
189-
operation: 'copy-channel'
189+
operation: 'duplicate-channel'
190190
},
191191
on: {
192192
pageAfterOut (event, page) {

‎bundles/org.openhab.ui/web/src/js/routes.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export default [
192192
async: loadAsync(ItemEditPage, { createMode: true })
193193
},
194194
{
195-
path: 'copy',
195+
path: 'duplicate',
196196
beforeEnter: [enforceAdminForRoute],
197197
async: loadAsync(ItemEditPage, { createMode: true })
198198
},
@@ -287,7 +287,7 @@ export default [
287287
]
288288
},
289289
{
290-
path: 'copy',
290+
path: 'duplicate',
291291
beforeEnter: [enforceAdminForRoute],
292292
beforeLeave: [checkDirtyBeforeLeave],
293293
async: loadAsync(AddThingPage)
@@ -336,7 +336,7 @@ export default [
336336
async: loadAsync(RuleEditPage, { createMode: true })
337337
},
338338
{
339-
path: 'copy',
339+
path: 'duplicate',
340340
beforeEnter: [enforceAdminForRoute],
341341
beforeLeave: [checkDirtyBeforeLeave],
342342
async: loadAsync(RuleEditPage, { createMode: true })
@@ -369,7 +369,7 @@ export default [
369369
async: loadAsync(SceneEditPage, { createMode: true })
370370
},
371371
{
372-
path: 'copy',
372+
path: 'duplicate',
373373
beforeEnter: [enforceAdminForRoute],
374374
beforeLeave: [checkDirtyBeforeLeave],
375375
async: loadAsync(SceneEditPage, { createMode: true })
@@ -394,7 +394,7 @@ export default [
394394
async: loadAsync(ScriptEditPage, { createMode: true })
395395
},
396396
{
397-
path: 'copy',
397+
path: 'duplicate',
398398
beforeEnter: [enforceAdminForRoute],
399399
beforeLeave: [checkDirtyBeforeLeave],
400400
async: loadAsync(ScriptEditPage, { createMode: true })

‎bundles/org.openhab.ui/web/src/pages/settings/items/item-details.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
<f7-row>
8888
<f7-col>
8989
<f7-list>
90-
<f7-list-button color="blue" @click="copyItem">
91-
Copy Item
90+
<f7-list-button color="blue" @click="duplicateItem">
91+
Duplicate Item
9292
</f7-list-button>
9393
<f7-list-button v-if="item.editable" color="red" @click="deleteItem">
9494
Remove Item
@@ -207,10 +207,10 @@ export default {
207207
this.iconUrl = '/icon/' + this.item.category + '?format=svg'
208208
})
209209
},
210-
copyItem () {
210+
duplicateItem () {
211211
let itemClone = cloneDeep(this.item)
212212
this.$f7router.navigate({
213-
url: '/settings/items/copy'
213+
url: '/settings/items/duplicate'
214214
}, {
215215
props: {
216216
itemCopy: itemClone

‎bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
</f7-col>
133133
<f7-col v-if="isEditable && (!createMode)">
134134
<f7-list>
135-
<f7-list-button color="blue" @click="copyRule">
136-
Copy Rule
135+
<f7-list-button color="blue" @click="duplicateRule">
136+
Duplicate Rule
137137
</f7-list-button>
138138
<f7-list-button color="red" @click="deleteRule">
139139
Remove Rule
@@ -333,7 +333,7 @@ export default {
333333
}).open()
334334
this.$f7router.navigate(this.$f7route.url
335335
.replace('/add', '/' + this.rule.uid)
336-
.replace('/copy', '/' + this.rule.uid)
336+
.replace('/duplicate', '/' + this.rule.uid)
337337
.replace('/schedule/', '/rules/'), { reloadCurrent: true })
338338
this.load()
339339
} else {
@@ -355,10 +355,10 @@ export default {
355355
}).open()
356356
})
357357
},
358-
copyRule () {
358+
duplicateRule () {
359359
let ruleClone = cloneDeep(this.rule)
360360
this.$f7router.navigate({
361-
url: '/settings/rules/copy'
361+
url: '/settings/rules/duplicate'
362362
}, {
363363
props: {
364364
ruleCopy: ruleClone

‎bundles/org.openhab.ui/web/src/pages/settings/rules/scene/scene-edit.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
</f7-col>
116116
<f7-col v-if="isEditable && !createMode">
117117
<f7-list>
118-
<f7-list-button color="blue" @click="copyRule">
119-
Copy Scene
118+
<f7-list-button color="blue" @click="duplicateRule">
119+
Duplicate Scene
120120
</f7-list-button>
121121
<f7-list-button color="red" @click="deleteRule">
122122
Remove Scene
@@ -372,10 +372,10 @@ export default {
372372
})
373373
})
374374
},
375-
copyRule () {
375+
duplicateRule () {
376376
let ruleClone = cloneDeep(this.rule)
377377
this.$f7router.navigate({
378-
url: '/settings/scenes/copy'
378+
url: '/settings/scenes/duplicate'
379379
}, {
380380
props: {
381381
ruleCopy: ruleClone

‎bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<f7-block class="block-narrow" v-if="editable && isScriptRule">
132132
<f7-col>
133133
<f7-list>
134-
<f7-list-button color="blue" @click="copyRule">
135-
Copy Script
134+
<f7-list-button color="blue" @click="duplicateRule">
135+
Duplicate Script
136136
</f7-list-button>
137137
<f7-list-button color="red" @click="deleteRule">
138138
Remove Script
@@ -388,7 +388,7 @@ export default {
388388
destroyOnClose: true,
389389
closeTimeout: 2000
390390
}).open()
391-
this.$f7router.navigate(this.$f7route.url.replace(/(\/add)|(\/copy)/, '/' + this.rule.uid), { reloadCurrent: true })
391+
this.$f7router.navigate(this.$f7route.url.replace(/(\/add)|(\/duplicate)/, '/' + this.rule.uid), { reloadCurrent: true })
392392
})
393393
},
394394
isMimeTypeAvailable (mimeType) {
@@ -595,10 +595,10 @@ export default {
595595
run(false)
596596
}
597597
},
598-
copyRule () {
598+
duplicateRule () {
599599
let ruleClone = cloneDeep(this.rule)
600600
this.$f7router.navigate({
601-
url: '/settings/scripts/copy'
601+
url: '/settings/scripts/duplicate'
602602
}, {
603603
props: {
604604
ruleCopy: ruleClone

‎bundles/org.openhab.ui/web/src/pages/settings/things/channel/channel-copy.vue ‎bundles/org.openhab.ui/web/src/pages/settings/things/channel/channel-duplicate.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<f7-page @page:afterin="onPageAfterIn" name="channel-copy">
3-
<f7-navbar title="Copy channel" :subtitle="thing.label" back-link="Cancel">
2+
<f7-page @page:afterin="onPageAfterIn" name="channel-duplicate">
3+
<f7-navbar title="Duplicate channel" :subtitle="thing.label" back-link="Cancel">
44
<f7-nav-right>
55
<f7-link @click="save()" v-if="$theme.md" icon-md="material:save" icon-only />
66
<f7-link @click="save()" v-if="!$theme.md">

‎bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue

+8-4
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,12 @@
137137
<f7-col>
138138
<f7-list>
139139
<f7-list-button v-if="thing.statusInfo.statusDetail === 'HANDLER_MISSING_ERROR'" color="blue" title="Install Binding" @click="installBinding" />
140-
<f7-list-button v-if="!error" color="blue" title="Copy Thing" @click="copyThing" />
141-
<f7-list-button v-if="editable" color="red" title="Delete Thing" @click="deleteThing" />
140+
<f7-list-button v-if="!error" color="blue" @click="duplicateThing">
141+
Duplicate Thing
142+
</f7-list-button>
143+
<f7-list-button v-if="editable" color="red" @click="deleteThing">
144+
Remove Thing
145+
</f7-list-button>
142146
</f7-list>
143147
</f7-col>
144148
</f7-block>
@@ -619,10 +623,10 @@ export default {
619623
}
620624
})
621625
},
622-
copyThing () {
626+
duplicateThing () {
623627
let thingClone = cloneDeep(this.thing)
624628
this.$f7router.navigate({
625-
url: '/settings/things/copy'
629+
url: '/settings/things/duplicate'
626630
}, {
627631
props: {
628632
thingTypeId: this.thing.thingTypeUID,

0 commit comments

Comments
 (0)