We are moving to Git Issues for bug tracking in future releases. During transition, content will be in both tools. If you'd like to file a new bug, please create an issue.

View | Details | Raw Unified | Return to bug 6068 | Differences between
and this patch

Collapse All | Expand All

(-)a/classes/security/RoleDAO.inc.php (-2 / +2 lines)
 Lines 41-47   class RoleDAO extends DAO { Link Here 
41
	function &getUsersByRoleId($roleId = null, $pressId = null, $searchType = null, $search = null, $searchMatch = null, $dbResultRange = null) {
41
	function &getUsersByRoleId($roleId = null, $pressId = null, $searchType = null, $search = null, $searchMatch = null, $dbResultRange = null) {
42
		$users = array();
42
		$users = array();
43
43
44
		$paramArray = array('interest');
44
		$paramArray = array(ASSOC_TYPE_USER, 'interest');
45
		if (isset($roleId)) $paramArray[] = (int) $roleId;
45
		if (isset($roleId)) $paramArray[] = (int) $roleId;
46
		if (isset($pressId)) $paramArray[] = (int) $pressId;
46
		if (isset($pressId)) $paramArray[] = (int) $pressId;
47
		// For security / resource usage reasons, a role or press ID
47
		// For security / resource usage reasons, a role or press ID
 Lines 88-94   class RoleDAO extends DAO { Link Here 
88
		$searchSql .= ' ORDER BY u.last_name, u.first_name'; // FIXME Add "sort field" parameter?
88
		$searchSql .= ' ORDER BY u.last_name, u.first_name'; // FIXME Add "sort field" parameter?
89
89
90
		$result =& $this->retrieveRange(
90
		$result =& $this->retrieveRange(
91
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)
91
			'SELECT DISTINCT u.* FROM users AS u LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)
92
			LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)
92
			LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)
93
			LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),
93
			LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id),
94
			user_groups AS ug, user_user_groups AS uug
94
			user_groups AS ug, user_user_groups AS uug
(-)a/classes/submission/editor/EditorSubmissionDAO.inc.php (-2 / +2 lines)
 Lines 607-613   class EditorSubmissionDAO extends DAO { Link Here 
607
	function &getUsersNotAssignedToMonograph($pressId, $monographId, $roleId, $searchType=null, $search=null, $searchMatch=null, $rangeInfo = null) {
607
	function &getUsersNotAssignedToMonograph($pressId, $monographId, $roleId, $searchType=null, $search=null, $searchMatch=null, $rangeInfo = null) {
608
		$users = array();
608
		$users = array();
609
609
610
		$paramArray = array('interest', $monographId, $pressId, $roleId);
610
		$paramArray = array(ASSOC_TYPE_USER, 'interest', $monographId, $pressId, $roleId);
611
		$searchSql = '';
611
		$searchSql = '';
612
612
613
		$searchTypeMap = array(
613
		$searchTypeMap = array(
 Lines 670-676   class EditorSubmissionDAO extends DAO { Link Here 
670
			'SELECT DISTINCT
670
			'SELECT DISTINCT
671
				u.*
671
				u.*
672
			FROM	users u
672
			FROM	users u
673
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)
673
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)
674
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)
674
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)
675
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)
675
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)
676
				LEFT JOIN roles r ON (r.user_id = u.user_id)
676
				LEFT JOIN roles r ON (r.user_id = u.user_id)
(-)a/classes/submission/seriesEditor/SeriesEditorSubmissionDAO.inc.php (-2 / +2 lines)
 Lines 820-826   class SeriesEditorSubmissionDAO extends DAO { Link Here 
820
		$users = array();
820
		$users = array();
821
821
822
		$paramArray = array(
822
		$paramArray = array(
823
				'interest', $monographId, ASSOC_TYPE_MONOGRAPH,
823
				ASSOC_TYPE_USER, 'interest', $monographId, ASSOC_TYPE_MONOGRAPH,
824
				'SIGNOFF_COPYEDITING_INITIAL',
824
				'SIGNOFF_COPYEDITING_INITIAL',
825
				$pressId, RoleDAO::getRoleIdFromPath('copyeditor')
825
				$pressId, RoleDAO::getRoleIdFromPath('copyeditor')
826
				);
826
				);
 Lines 865-871   class SeriesEditorSubmissionDAO extends DAO { Link Here 
865
		$result =& $this->retrieve(
865
		$result =& $this->retrieve(
866
			'SELECT	u.*
866
			'SELECT	u.*
867
			FROM	users u
867
			FROM	users u
868
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_id = u.user_id AND cv.symbolic = ?)
868
				LEFT JOIN controlled_vocabs cv ON (cv.assoc_type = ? AND cv.assoc_id = u.user_id AND cv.symbolic = ?)
869
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)
869
				LEFT JOIN controlled_vocab_entries cve ON (cve.controlled_vocab_id = cv.controlled_vocab_id)
870
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)
870
				LEFT JOIN controlled_vocab_entry_settings cves ON (cves.controlled_vocab_entry_id = cve.controlled_vocab_entry_id)
871
				LEFT JOIN roles r ON (r.user_id = u.user_id)
871
				LEFT JOIN roles r ON (r.user_id = u.user_id)

Return to bug 6068