-
Notifications
You must be signed in to change notification settings - Fork 179
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
[Conflict Resolver] Enabling Active Candidate and Active Session Check in Query #3792
[Conflict Resolver] Enabling Active Candidate and Active Session Check in Query #3792
Conversation
@@ -236,7 +236,7 @@ class Conflict_Resolver extends \NDB_Menu_Filter_Form | |||
LEFT JOIN session ON (flag.SessionID=session.ID) | |||
LEFT JOIN candidate ON (candidate.CandID=session.CandID) | |||
LEFT JOIN Project ON (candidate.ProjectID=Project.ProjectID ) | |||
WHERE 1=1"; | |||
WHERE 1=1 AND candidate.Active ='Y'"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can take out the 1=1. That's just there to ensure that if filters add "AND" clauses it doesn't become an SQL syntax error but is unnecessary if there's already a WHERE clause in the query.
@@ -84,7 +84,7 @@ class Resolved_Conflicts extends \NDB_Menu_Filter | |||
LEFT JOIN session ON (flag.SessionID=session.ID) | |||
LEFT JOIN candidate ON (candidate.CandID=session.CandID) | |||
LEFT JOIN Project ON (candidate.ProjectID=Project.ProjectID ) | |||
WHERE 1=1"; | |||
WHERE 1=1 AND candidate.Active ='Y'"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here
@driusan Done the requested changes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not tested
@sruthymathew123 The dashboard also filter on session.Active = 'Y' |
@xlecours Good question. I think we have to consider that also. |
@sruthymathew123 |
Redmine 14872
Conflict Resolver is pulling results of Inactive Candidates and Inactive Sessions. This leads to one of the reason for IBIS where our conflicts count in dashboard doesn't match with the count in conflict resolver.