Skip to content

Commit

Permalink
⬆️ updated package dependencies (including Meteor.js)
Browse files Browse the repository at this point in the history
🐛 fixed issue Task list field is hidden when double clicked for edit #196
🐛 fixed issue Task date bar toast persists #195
🐛 fixed issue Tasks displayed on track time form #193
  • Loading branch information
faburem committed Dec 17, 2023
1 parent f7a0793 commit beab8f2
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 113 deletions.
20 changes: 10 additions & 10 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
# but you can also edit it by hand.

[email protected] # Packages every Meteor app needs to have
[email protected].0 # Packages for a great mobile UX
[email protected].7 # The database Meteor supports right now
[email protected].1 # Packages for a great mobile UX
[email protected].8 # The database Meteor supports right now
[email protected] # Reactive variable for tracker
[email protected].2 # Meteor's client-side reactive programming library
[email protected].3 # Meteor's client-side reactive programming library

[email protected] # ECMAScript 5 compatibility for older browsers.
[email protected].7 # Enable ECMAScript2015+ syntax in app code
[email protected].8 # Enable ECMAScript2015+ syntax in app code
[email protected] # Server-side component of the `meteor shell` command

fourseven:[email protected]
accounts-password@2.3.4
accounts-password@2.4.0
[email protected]
[email protected]
[email protected]
Expand All @@ -28,13 +28,13 @@ ostrio:flow-router-extra
[email protected]
faburem:accounts-anonymous
mdg:validated-method
[email protected].1
[email protected].0
[email protected].8
[email protected].2
[email protected].2
[email protected].1
[email protected].9
[email protected].3
[email protected]
[email protected]
blaze-html-templates
[email protected].0
[email protected].1
[email protected]
[email protected]
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.13.3
METEOR@2.14
47 changes: 24 additions & 23 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[email protected].8
[email protected].2
accounts-password@2.3.4
[email protected].9
[email protected].3
accounts-password@2.4.0
[email protected]
[email protected]
[email protected].4
[email protected].5
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
Expand All @@ -20,11 +20,11 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
ddp-server@2.6.2
[email protected].1
ddp-server@2.7.0
[email protected]
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
Expand All @@ -33,7 +33,7 @@ [email protected]
[email protected]
faburem:[email protected]
faburem:[email protected]
[email protected].3
[email protected].4
fourseven:[email protected]
[email protected]
[email protected]
Expand All @@ -43,26 +43,26 @@ [email protected]
[email protected]
[email protected]
[email protected]
launch-screen@1.3.0
launch-screen@2.0.0
[email protected]
[email protected].2
[email protected].3
mdg:[email protected]
[email protected].3
[email protected].4
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected].9
modules@0.19.0
[email protected].10
modules@0.20.0
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
npm-mongo@4.16.0
[email protected].0
npm-mongo@4.17.2
[email protected].1
[email protected]
[email protected]
[email protected]
Expand All @@ -72,16 +72,16 @@ ostrio:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
Expand All @@ -90,10 +90,11 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
tunguska:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].5
[email protected].6
[email protected]
zodern:[email protected]
12 changes: 6 additions & 6 deletions imports/api/tasks/server/publications.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { check } from 'meteor/check'
import { checkAuthentication } from '../../../utils/server_method_helpers.js'
import { checkAuthentication, getGlobalSettingAsync } from '../../../utils/server_method_helpers.js'
import Tasks from '../tasks.js'

Meteor.publish('mytasks', async function mytasks({ filter, projectId }) {
check(filter, Match.Optional(String))
check(projectId, Match.Optional(String))
await checkAuthentication(this)
const taskFilter = {
$or: [{ userId: this.userId }],
}
if (projectId) {
if (projectId && projectId !== undefined && projectId !== '') {
check(projectId, String)
taskFilter.$or.push({ projectId })
}
if (filter) {
if (filter && filter !== undefined && filter !== '') {
check(filter, String)
taskFilter.name = { $regex: `.*${filter.replace(/[-[\]{}()*+?.,\\/^$|#\s]/g, '\\$&')}.*`, $options: 'i' }
}
return Tasks.find(taskFilter, { sort: { projectId: -1, lastUsed: -1 }, limit: 10 })
return Tasks.find(taskFilter, { sort: { projectId: -1, lastUsed: -1 }, limit: await getGlobalSettingAsync('taskSearchNumResults') })
})

Meteor.publish('allmytasks', async function mytasks({ filter, limit }) {
Expand Down
7 changes: 6 additions & 1 deletion imports/ui/pages/track/components/projectTasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ Template.projectTasks.onRendered(() => {
noDataMessage: t('tabular.sZeroRecords'),
getEditor(colIndex, rowIndex, value, parent, column, row, data) {
templateInstance.editTaskID.set(row[0].content)
templateInstance.$(parent.parentNode).removeClass('dt-cell--editing')
new Bootstrap.Modal(templateInstance.$('#task-modal')).show()
return false
return null
},
}
window.requestAnimationFrame(() => {
Expand Down Expand Up @@ -140,6 +141,10 @@ Template.projectTasks.events({
Bootstrap.Modal.getOrCreateInstance(templateInstance.$('#task-modal')).dispose()
Bootstrap.Modal.getOrCreateInstance(templateInstance.$('#task-modal')).show()
},
'focusout #projectGantt': (event, templateInstance) => {
event.preventDefault()
templateInstance.ganttchart.hide_popup()
},
})

Template.projectTasks.onDestroyed(() => {
Expand Down
3 changes: 3 additions & 0 deletions imports/ui/styles/dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ $accordion-bg: $grey;
//Table
$table-color: $data-text-color;

//Checkbox
$form-check-input-border: $light solid;

//++++ [AdvancedCustomization] ++++ ///////////////////////////////////////////////////////
.is-dark-theme {
color: black;
Expand Down
Loading

0 comments on commit beab8f2

Please sign in to comment.