Skip to content

Commit

Permalink
FOUR-9506:My task needs to apply the same filter to TASK
Browse files Browse the repository at this point in the history
  • Loading branch information
fagubla committed Oct 11, 2023
1 parent de3c7f4 commit c452e7a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/components/renderer/form-requests.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export default {
},
mounted() {
this.setFields();
this.pmql = `(status = "In Progress") AND (requester = "${Processmaker.user.username}")`;
this.fetch();
},
methods: {
Expand Down Expand Up @@ -111,7 +112,8 @@ export default {
ProcessMaker.apiClient
.get(
`requests?page=${this.page}&include=process,participants,data` +
`&per_page=${this.perPage}&filter=${filter}&order_by=${
`&pmql=${encodeURIComponent(pmql)}
&per_page=${this.perPage}&filter=${filter}&order_by=${
this.orderBy === "__slot:ids" ? "id" : this.orderBy
}&order_direction=${this.orderDirection}${this.additionalParams}`
)
Expand Down
3 changes: 2 additions & 1 deletion src/components/renderer/form-tasks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default {
},
mounted() {
this.setFields();
this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "In Progress")`;
this.fetch();
},
methods: {
Expand Down Expand Up @@ -117,7 +118,7 @@ export default {
ProcessMaker.apiClient
.get(
`tasks?page=${this.page}&include=process,processRequest,processRequest.user,user,data` +
`&per_page=${
`&pmql=${encodeURIComponent(pmql)}&per_page=${
this.perPage
}${filterParams}${this.getSortParam()}&non_system=true`
)
Expand Down

0 comments on commit c452e7a

Please sign in to comment.