Skip to content

Commit

Permalink
Various fixes (#1473)
Browse files Browse the repository at this point in the history
* [qa] bump dependencies

* [admin] disallow to delete task status for concept

* [tasks] fix side effect on realtime update

Avoid invalid task update on websocket events.

* [qa] remove useless code

Focus already set on another field

* [qa] improve code with computed

* [qa] fix admin forms with description

* [qa] bump dependencies
  • Loading branch information
NicoPennec authored Jul 2, 2024
1 parent f3eb6ac commit 5c041b6
Show file tree
Hide file tree
Showing 11 changed files with 145 additions and 132 deletions.
136 changes: 68 additions & 68 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@fullcalendar/multimonth": "6.1.14",
"@fullcalendar/vue": "6.1.14",
"@google/model-viewer": "3.5.0",
"@sentry/vue": "8.11.0",
"@sentry/vue": "8.13.0",
"async": "3.2.5",
"bowser": "2.11.0",
"chart.js": "2.9.4",
Expand Down Expand Up @@ -73,15 +73,15 @@
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-vue": "9.26.0",
"eslint-plugin-vue": "9.27.0",
"esm": "3.2.25",
"husky": "8.0.3",
"jsdom": "24.1.0",
"lint-staged": "15.2.7",
"localStorage": "1.0.4",
"prettier": "3.3.2",
"sass": "1.77.6",
"vite": "5.3.1",
"vite": "5.3.2",
"vitest": "0.34.6",
"vitest-localstorage-mock": "0.1.2",
"vue-template-compiler": "2.7.16"
Expand Down
12 changes: 6 additions & 6 deletions src/components/lists/TaskStatusList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/>
<row-actions-cell
:entry-id="entry.id"
:hide-delete="entry.is_default === true"
:hide-delete="entry.is_default === true || entry.for_concept"
@edit-clicked="$emit('edit-clicked', entry)"
@delete-clicked="$emit('delete-clicked', entry)"
/>
Expand All @@ -94,10 +94,10 @@ import { HelpCircleIcon } from 'vue-feather-icons'
import { formatListMixin } from '@/components/mixins/format'
import BooleanCell from '@/components/cells/BooleanCell'
import RowActionsCell from '@/components/cells/RowActionsCell'
import TableInfo from '@/components/widgets/TableInfo'
import TaskStatusCell from '@/components/cells/TaskStatusCell'
import BooleanCell from '@/components/cells/BooleanCell.vue'
import RowActionsCell from '@/components/cells/RowActionsCell.vue'
import TableInfo from '@/components/widgets/TableInfo.vue'
import TaskStatusCell from '@/components/cells/TaskStatusCell.vue'
export default {
name: 'task-status-list',
Expand All @@ -120,9 +120,9 @@ export default {
},
components: {
HelpCircleIcon,
BooleanCell,
draggable,
HelpCircleIcon,
RowActionsCell,
TableInfo,
TaskStatusCell
Expand Down
Loading

0 comments on commit 5c041b6

Please sign in to comment.