Skip to content

Commit

Permalink
feature/FOUR-18537
Browse files Browse the repository at this point in the history
  • Loading branch information
luNunezProcessmaker committed Sep 10, 2024
1 parent 4ed63c8 commit e3394af
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion resources/js/processes/components/ProcessMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {
// change method sort by user
this.orderBy = this.orderBy === "user" ? "user.firstname" : this.orderBy;
// change method sort by slot name
this.orderBy = this.orderBy === "__slot:name" ? "name" : this.orderBy;
this.orderBy = this.orderBy === "__slot:updated_at" ? "updated_at" : this.orderBy;

const url = this.status === null || this.status === "" || this.status === undefined
? "processes?"
Expand Down
11 changes: 6 additions & 5 deletions resources/js/processes/components/ProcessesListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ export default {
props: ["filter", "id", "status", "permission", "isDocumenterInstalled", "pmql", "processName", "currentUserId"],
data() {
return {
orderBy: "name",
orderBy: "updated_at",
orderDirection: "desc",
processId: null,
processTemplateName: "",
pmBlockName: "",
Expand All @@ -202,9 +203,9 @@ export default {
previousPmql: "",
sortOrder: [
{
field: "name",
sortField: "name",
direction: "asc",
field: "updated_at",
sortField: "updated_at",
direction: "desc",
},
],
Expand Down Expand Up @@ -239,7 +240,7 @@ export default {
format: "datetime",
width: 160,
sortable: true,
direction: "none",
direction: "desc",
},
{
label: this.$t("Created"),
Expand Down
15 changes: 8 additions & 7 deletions resources/js/processes/screens/components/ScreenListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -168,18 +168,19 @@ export default {
props: ["filter", "id", "permission", "currentUserId", "types"],
data() {
return {
orderBy: "title",
orderBy: "updated_at",
orderDirection: "desc",
screenId: null,
assetName: " ",
assignedProjects: [],
screenTemplateName: "",
screenType: "",
sortOrder: [
{
field: "title",
sortField: "title",
direction: "asc"
}
field: "updated_at",
sortField: "updated_at",
direction: "desc",
},
],
fields: [
Expand Down Expand Up @@ -233,7 +234,7 @@ export default {
label: this.$t("Modified"),
field: "updated_at",
sortable: true,
direction: "none",
direction: "desc",
format: "datetime",
width: 140,
sortField: "updated_at",
Expand Down Expand Up @@ -300,7 +301,7 @@ export default {
fetch() {
this.loading = true;
//change method sort by slot name
this.orderBy = this.orderBy === "__slot:title" ? "title" : this.orderBy;
this.orderBy = this.orderBy === "__slot:updated_at" ? "updated_at" : this.orderBy;
// Load from our api client
ProcessMaker.apiClient
.get(
Expand Down
14 changes: 7 additions & 7 deletions resources/js/processes/scripts/components/ScriptListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@ export default {
return {
assetId: null,
assetName: "",
orderBy: "title",
orderBy: "updated_at",
orderDirection: "desc",
sortOrder: [
{
field: "title",
sortField: "title",
direction: "asc"
}
field: "updated_at",
sortField: "updated_at",
direction: "desc",
},
],
fields: [
Expand Down Expand Up @@ -211,7 +211,7 @@ export default {
label: this.$t("Modified"),
field: "updated_at",
sortable: true,
direction: "none",
direction: "desc",
format: "datetime",
width: 140,
callback: "formatDate",
Expand Down

0 comments on commit e3394af

Please sign in to comment.