Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes #1630

Merged
merged 5 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 52 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@fullcalendar/multimonth": "6.1.15",
"@fullcalendar/vue3": "6.1.15",
"@google/model-viewer": "3.5.0",
"@sentry/vue": "8.45.1",
"@sentry/vue": "8.47.0",
"@unhead/vue": "1.11.14",
"@vuepic/vue-datepicker": "9.0.3",
"async": "3.2.6",
Expand All @@ -43,7 +43,7 @@
"panzoom": "9.4.3",
"papaparse": "5.4.1",
"qrcode.vue": "3.6.0",
"sanitize-html": "2.13.1",
"sanitize-html": "2.14.0",
"socket.io-client": "4.8.1",
"superagent": "9.0.2",
"textarea-caret": "3.1.0",
Expand Down
5 changes: 2 additions & 3 deletions src/components/modals/AddMetadataModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
</div>

<text-field
ref="addChoiceField"
v-model.trim="valueToAdd"
:button-label="$t('main.add')"
@enter="addValue"
Expand Down Expand Up @@ -302,8 +301,8 @@ export default {
},

methods: {
addValue() {
const newValue = this.$refs.addChoiceField.value
addValue(value) {
const newValue = value
if (!this.form.values.find(v => v === newValue) && newValue) {
this.form.values.push(newValue)
if (this.form.data_type === 'taglist') {
Expand Down
12 changes: 10 additions & 2 deletions src/components/modals/ManageShotsModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@
<script>
import { mapGetters } from 'vuex'

import shotStore from '@/store/modules/shots'

import { modalMixin } from '@/components/modals/base_modal'

import stringHelpers from '@/lib/string'
Expand Down Expand Up @@ -220,8 +222,7 @@ export default {
'currentProduction',
'displayedEpisodes',
'displayedSequences',
'isTVShow',
'shots'
'isTVShow'
]),

isAddEpisodeAllowed() {
Expand All @@ -246,6 +247,10 @@ export default {
return this.names.shot === shot.name
})
return !isEmpty && !isExist && this.selectedSequenceId
},

shots() {
return shotStore.cache.shots
}
},

Expand Down Expand Up @@ -352,6 +357,9 @@ export default {
if (this.active) {
this.shotPadding = '1'
this.sequences = this.displayedSequences
if (this.selectedSequenceId) {
this.selectSequence(this.selectedSequenceId)
}
setTimeout(() => {
if (this.isTVShow) {
this.$refs.addEpisodeInput.focus()
Expand Down
8 changes: 4 additions & 4 deletions src/components/pages/Notifications.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<span class="filler"></span>
<button-simple
class="flexrow-item"
@click="markAllNotificationsRead"
:loading="loading.markAll"
:is-loading="loading.markAll"
:text="$t('notifications.mark_all_as_read')"
@click="markAllNotificationsRead"
/>
</div>
<div
Expand Down Expand Up @@ -137,7 +137,7 @@
class="selector"
:label="$t('notifications.read')"
is-small
@input="value => toggleNotificationRead(notification, value)"
@click="value => toggleNotificationRead(notification, value)"
:value="notification.read ? 'true' : 'false'"
/>
</div>
Expand Down Expand Up @@ -612,7 +612,7 @@ export default {
async markAllNotificationsRead() {
this.loading.markAll = true
await this.markAllNotificationsAsRead()
this.loading.markAll = true
this.loading.markAll = false
}
},

Expand Down
Loading
Loading