Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 [Frontend] Show trashedAt and trashedBy on Bin cards #7030

Merged
merged 29 commits into from
Jan 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
56fa881
trash icon
odeimaiz Jan 13, 2025
1ed0135
Trash -> Bin
odeimaiz Jan 13, 2025
3e9c34c
Delete -> Delete permanently
odeimaiz Jan 13, 2025
30c8967
Merge branch 'master' into fix/trash-paging
odeimaiz Jan 13, 2025
90c9f4d
minor
odeimaiz Jan 13, 2025
5c89ba7
minor
odeimaiz Jan 13, 2025
aa41c1e
fix trash paging
odeimaiz Jan 13, 2025
5e3e8b5
minor
odeimaiz Jan 13, 2025
814898c
show trashed at in folder
odeimaiz Jan 13, 2025
ace6b69
workspace show trashed at
odeimaiz Jan 13, 2025
7d4ff8c
trashedAt in study cards
odeimaiz Jan 13, 2025
690fa62
trashed by in Workspace
odeimaiz Jan 13, 2025
0b4bf88
trashed by
odeimaiz Jan 13, 2025
4ae5bb7
WS: tooltip on title only
odeimaiz Jan 13, 2025
d09d41d
Merge branch 'master' into enh/show-trashed-at-date
odeimaiz Jan 14, 2025
9cb8a3c
[skip ci] rename
odeimaiz Jan 14, 2025
87072ca
Merge branch 'master' into enh/show-trashed-at-date
odeimaiz Jan 17, 2025
c8b38b6
[skip ci] trashedAt workspace and folder
odeimaiz Jan 17, 2025
606cecf
[skip ci] trashed at studies
odeimaiz Jan 17, 2025
b5baa85
[skip ci] trashedBy in folder
odeimaiz Jan 17, 2025
7863d91
[skip ci] DateAndBy
odeimaiz Jan 17, 2025
1f62068
[skip ci] reuse widget
odeimaiz Jan 17, 2025
d70c956
dateBy
odeimaiz Jan 17, 2025
e5913b7
minor
odeimaiz Jan 17, 2025
c5c019d
unused
odeimaiz Jan 17, 2025
4582722
"by me"
odeimaiz Jan 17, 2025
21d91c3
shorter date
odeimaiz Jan 17, 2025
86dc4f4
minor
odeimaiz Jan 17, 2025
09e4e97
Merge branch 'master' into enh/show-trashed-at-date
odeimaiz Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
"by me"
  • Loading branch information
odeimaiz committed Jan 17, 2025
commit 4582722602ee7538d0a21f54736a20f4d4e4876c
Original file line number Diff line number Diff line change
@@ -87,7 +87,13 @@ qx.Class.define("osparc.ui.basic.DateAndBy", {
__applyGroupId: function(groupId) {
if (groupId) {
const atom = this.getChildControl("last-touching");
const myGroupId = osparc.auth.Data.getInstance().getGroupId();
if (groupId === myGroupId) {
atom.setLabel("by me");
} else {
atom.setLabel("by");
osparc.dashboard.CardBase.addHintFromGids(atom, [groupId]);
}
}
},
}