apairon/mocoapp-browser-extension
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Honor the selected task and set the correct billability

Browse Source
This commit is contained in:
Manuel Bouza
2019-03-29 23:52:07 +01:00
parent 76fe6bb351
commit 18aa52ae10
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/components/App.js
View File

@@ -63,12 +63,14 @@ class App extends Component {
const { service, projects, lastProjectId, lastTaskId } = this.props const { service, projects, lastProjectId, lastTaskId } = this.props
const project = const project =
findProjectByValue(this.changeset.assignment_id)(projects) ||
findProjectByIdentifier(service?.projectId)(projects) || findProjectByIdentifier(service?.projectId)(projects) ||
findProjectByValue(Number(lastProjectId))(projects) || findProjectByValue(Number(lastProjectId))(projects) ||
head(projects) head(projects)
const task = const task =
findTask(service?.taskId || lastTaskId)(project) || head(project?.tasks) findTask(this.changeset.task_id || service?.taskId || lastTaskId)(project) ||
head(project?.tasks)
const defaults = { const defaults = {
remote_service: service?.name, remote_service: service?.name,
@@ -109,7 +111,7 @@ class App extends Component {
if (name === "assignment_id") { if (name === "assignment_id") {
const project = findProjectByValue(value)(projects) const project = findProjectByValue(value)(projects)
this.changeset.task_id = head(project?.tasks).value || null this.changeset.task_id = head(project?.tasks)?.value
} }
}; };