Skip to content

Commit 68423b2

Browse files
Merge pull request #3923 from OneCommunityGlobal/venkataramanan_fix_timelog_issue_in_user_management_and_link_color
Venkataramanan fix timelog issue in user management and link color
2 parents b2738e4 + 3aa5ddf commit 68423b2

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/components/Timelog/Timelog.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
}
112112

113113
/* Hotfix: Prevent red color for project name and notes in Timelog */
114-
.notes-section, .notes-section *,
114+
.notes-section, .notes-section *:not(a),
115115
.text-success, .text-light, .text-muted, .dark-text-info, .dark-text-muted {
116116
color: #222 !important;
117117
}

src/components/UserManagement/UserTableData.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,14 @@ const UserTableData = React.memo(props => {
230230
return;
231231
}
232232

233+
const url = `${window.location.origin}/timelog/${props.user._id}#currentWeek`;
234+
233235
if (e.metaKey || e.ctrlKey || e.button === 1) {
234-
window.open(`/timelog/${props.user._id}`, '_blank');
236+
window.open(url, '_blank', 'noopener');
235237
return;
236238
}
237-
238-
e.preventDefault(); // prevent full reload
239-
history.push(`/timelog/${props.user._id}`);
239+
e.preventDefault();
240+
history.push(`/timelog/${props.user._id}#currentWeek`);
240241
}}
241242
/>
242243
</span>

0 commit comments

Comments
 (0)