Skip to content

Commit d1b9e5a

Browse files
committed
Bug fixes
Confirm dialog now focuses submit button No parameters command dialog now focuses Submit button Autoupdater should now download update only once Master definition error will set update state to false
1 parent 89010f9 commit d1b9e5a

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lazy-admin",
3-
"version": "0.4.8",
3+
"version": "0.4.9",
44
"description": "GUI for PowerShell scripts to simplify day to day IT tasks.",
55
"productName": "Lazy Admin",
66
"cordovaId": "eu.houby-studio.lazy-admin",

src/components/CommandDialog.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
/>
155155
<q-btn
156156
:label="$t('launch')"
157+
:autofocus="currentCommand.parameters ? currentCommand.parameters.length === 0 : false"
157158
type="submit"
158159
tabindex="998"
159160
flat

src/components/ExecuteDialog.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
v-close-popup
4545
:label="$t('launch')"
4646
type="submit"
47+
autofocus
4748
flat
4849
/>
4950
</q-card-actions>

src/layouts/FullLayout.vue

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<q-layout view="hhh lpr lff">
33
<q-header
44
:reveal-offset="Infinity"
5-
@focusin="$event"
65
class="window-color window-color-text"
76
elevated
87
reveal
@@ -20,10 +19,10 @@
2019
<q-toolbar>
2120
<q-btn
2221
@click="left = !left"
22+
icon="menu"
2323
dense
2424
flat
2525
round
26-
icon="menu"
2726
/>
2827

2928
<q-space />
@@ -32,11 +31,11 @@
3231
v-model="search"
3332
:placeholder="$t('search')"
3433
:disable="$route.path !== '/scripts'"
35-
dense
36-
outlined
3734
color="white"
3835
label-color="white"
3936
style="width: 90%;"
37+
dense
38+
outlined
4039
>
4140
<template v-slot:prepend>
4241
<q-icon
@@ -60,10 +59,10 @@
6059
<q-btn
6160
:flat="!historyVisible"
6261
@click="historyVisible = !historyVisible"
62+
icon="history"
6363
push
6464
round
6565
dense
66-
icon="history"
6766
>
6867
<q-tooltip>{{ $t('history') }}</q-tooltip>
6968
</q-btn>
@@ -84,9 +83,9 @@
8483
<q-item-label header>{{ $t('visibleGroups') }}</q-item-label>
8584
<q-item
8685
@click="showAll"
87-
clickable
8886
to="/scripts"
8987
active-class="text-white"
88+
clickable
9089
>
9190
<q-item-section avatar>
9291
<q-icon name="all_inclusive" />
@@ -116,9 +115,10 @@
116115
<q-separator />
117116

118117
<q-item
119-
clickable
120118
to="/settings"
121119
active-class="dark"
120+
ref="submit"
121+
clickable
122122
>
123123
<q-item-section avatar>
124124
<q-icon name="settings" />
@@ -129,9 +129,9 @@
129129
</q-item>
130130

131131
<q-item
132-
clickable
133132
to="/about"
134133
active-class="dark"
134+
clickable
135135
>
136136
<q-item-section avatar>
137137
<q-icon name="help" />
@@ -143,8 +143,8 @@
143143

144144
<q-item
145145
@click="showDebugWindow"
146-
clickable
147146
active-class="dark"
147+
clickable
148148
>
149149
<q-item-section avatar>
150150
<q-icon name="mdi-bug" />
@@ -372,8 +372,8 @@
372372
<q-btn
373373
v-close-popup
374374
icon="close"
375-
round
376375
color="primary"
376+
round
377377
>
378378
</q-btn>
379379
</q-card-actions>
@@ -761,14 +761,21 @@ export default {
761761
this.definitionsUpdateInProgress = false
762762
})
763763
764+
// Definitions: Register event listener when master definition errors
765+
this.$utils.on('master-check-error', (newMasterDefinition) => {
766+
this.definitionsUpdateInProgress = false
767+
})
768+
764769
// Register always listening function for Shift+F11 shortcut to display debug window
765770
globalShortcut.register('Shift+F11', () => {
766771
this.showDebugWindow()
767772
})
768773
769774
// Start application update check
770-
this.updateInProgress = true
771-
this.$autoUpdater.checkForUpdatesAndNotify()
775+
if (process.env.PROD) {
776+
this.updateInProgress = true
777+
this.$autoUpdater.checkForUpdates()
778+
}
772779
// Check if update was done today and if not, start definitions update check
773780
if (this.$utils.getDate() === this.updateDate) {
774781
console.log('Definitions were already updated today, automatic update skipped.')

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2651,9 +2651,9 @@ caniuse-api@^3.0.0:
26512651
lodash.uniq "^4.5.0"
26522652

26532653
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001061, caniuse-lite@^1.0.30001111:
2654-
version "1.0.30001114"
2655-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001114.tgz#2e88119afb332ead5eaa330e332e951b1c4bfea9"
2656-
integrity sha512-ml/zTsfNBM+T1+mjglWRPgVsu2L76GAaADKX5f4t0pbhttEp0WMawJsHDYlFkVZkoA+89uvBRrVrEE4oqenzXQ==
2654+
version "1.0.30001115"
2655+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001115.tgz#c04cd828883ba47f6f776312e0817bcc9040cfa4"
2656+
integrity sha512-NZrG0439ePYna44lJX8evHX2L7Z3/z3qjVLnHgbBb/duNEnGo348u+BQS5o4HTWcrb++100dHFrU36IesIrC1Q==
26572657

26582658
caseless@~0.12.0:
26592659
version "0.12.0"
@@ -4044,9 +4044,9 @@ [email protected]:
40444044
mime "^2.4.6"
40454045

40464046
electron-to-chromium@^1.3.523:
4047-
version "1.3.533"
4048-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz#d7e5ca4d57e9bc99af87efbe13e7be5dde729b0f"
4049-
integrity sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==
4047+
version "1.3.535"
4048+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.535.tgz#e31ee048de6f9c8d92bd25d4e3d1a92bedbe5cb2"
4049+
integrity sha512-5k7WGdl1ZnbcU97acUnY/UXu6bCMDnKCAnEc1N0xNToPvMCp99PEvh5K3xNr4ZUVCf2FuratM++NgOxCtbtXzA==
40504050

40514051
electron-updater@^4.3.1:
40524052
version "4.3.4"

0 commit comments

Comments
 (0)