diff --git a/modules/candidate_parameters/php/candidate_parameters.class.inc b/modules/candidate_parameters/php/candidate_parameters.class.inc index 9784e9f4511..0a6a1ae4e1b 100644 --- a/modules/candidate_parameters/php/candidate_parameters.class.inc +++ b/modules/candidate_parameters/php/candidate_parameters.class.inc @@ -29,8 +29,6 @@ namespace LORIS\candidate_parameters; */ class Candidate_Parameters extends \NDB_Form { - public $hasWritePermission = false; - /** * Check user permissions * @@ -40,11 +38,12 @@ class Candidate_Parameters extends \NDB_Form */ function _hasAccess(\User $user) : bool { - // Set global permission to control access - // to different modules of candidate_parameters page - $this->hasWritePermission = $user->hasPermission('candidate_parameter_edit'); - - return $user->hasPermission('candidate_parameter_view'); + return $user->hasAnyPermission( + array( + 'candidate_parameter_view', + 'candidate_parameter_edit', + ) + ); } /** diff --git a/modules/quality_control/php/quality_control.class.inc b/modules/quality_control/php/quality_control.class.inc index 98312f9b524..84463c2c139 100644 --- a/modules/quality_control/php/quality_control.class.inc +++ b/modules/quality_control/php/quality_control.class.inc @@ -1,6 +1,6 @@ * @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3 - * @link https://www.github.com/aces/CCNA/ + * @link https://www.github.com/aces/Loris */ namespace LORIS\quality_control; /** - * Main class for quality control module corresponding to /quality_control/ URL - * Tools section of the LorisMenu. + * Main class for quality control module corresponding to /quality_control/ + * endpoint. * * PHP Version 7 * @@ -22,13 +22,11 @@ namespace LORIS\quality_control; * @package Quality_Control * @author Liza Levitis * @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3 - * @link https://www.github.com/aces/CCNA/ + * @link https://www.github.com/aces/Loris */ class Quality_Control extends \NDB_Menu_Filter { - public $hasWritePermission = false; - public $AjaxModule = true; - public $hasHidePermission = false; + public $AjaxModule = true; public $fieldOptions; /** @@ -41,8 +39,7 @@ class Quality_Control extends \NDB_Menu_Filter */ function _hasAccess(\User $user) : bool { - //create user object - $this->hasHidePermission = $user->hasPermission("superuser"); + // FIXME This module should have its own permission. return $user->hasPermission('data_team_helper'); } diff --git a/modules/quality_control/php/quality_control_behavioral.class.inc b/modules/quality_control/php/quality_control_behavioral.class.inc index 5c14a6f16a3..7b4f18f5f1b 100644 --- a/modules/quality_control/php/quality_control_behavioral.class.inc +++ b/modules/quality_control/php/quality_control_behavioral.class.inc @@ -1,6 +1,6 @@ * @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3 - * @link https://www.github.com/aces/CCNA/ + * @link https://www.github.com/aces/Loris */ namespace LORIS\quality_control; /** - * Main class for quality control module corresponding to /quality_control/ URL - * Tools section of the LorisMenu. + * Quality_Control_Behavioral class. * * PHP Version 7 * @@ -22,12 +21,11 @@ namespace LORIS\quality_control; * @package Quality_Control * @author Liza Levitis * @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3 - * @link https://www.github.com/aces/CCNA/ + * @link https://www.github.com/aces/Loris */ class Quality_Control_Behavioral extends \NDB_Menu_Filter { - public $hasWritePermission = false; - public $AjaxModule = true; + public $AjaxModule = true; public $fieldOptions; /** @@ -40,7 +38,7 @@ class Quality_Control_Behavioral extends \NDB_Menu_Filter */ function _hasAccess(\User $user) : bool { - //create user object + // FIXME This module should have its own permission return $user->hasPermission('data_team_helper'); }