L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2017-01-24 22:03:48 +01:00
parent 0396389272 d636015c8a
commit ae8e8e6aa1
8 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+4 -2
View File
@@ -652,8 +652,9 @@ class assign_grading_table extends table_sql implements renderable {
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->assignment->get_context(), 'mod/assign:grade', '', $sort);
$markerlist[0] = get_string('choosemarker', 'assign');
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->assignment->get_context());
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);
$markerlist[$marker->id] = fullname($marker, $viewfullnames);
}
}
if (empty($markerlist)) {
@@ -662,7 +663,8 @@ class assign_grading_table extends table_sql implements renderable {
}
if ($this->is_downloading()) {
if (isset($markers[$row->allocatedmarker])) {
return fullname($markers[$row->allocatedmarker]);
return fullname($markers[$row->allocatedmarker],
has_capability('moodle/site:viewfullnames', $this->assignment->get_context()));
} else {
return '';
}
mod/assign/locallib.php
+19 -13
View File
@@ -3548,7 +3548,7 @@ class assign {
$extensionduedate = $flags->extensionduedate;
}
$showedit = $this->submissions_open($userid) && ($this->is_any_submission_plugin_enabled());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_course_context());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
$usergroups = $this->get_all_groups($user->id);
$submissionstatus = new assign_submission_status_compact($instance->allowsubmissionsfromdate,
@@ -3711,7 +3711,7 @@ class assign {
$user = $DB->get_record('user', array('id' => $userid));
if ($user) {
$this->update_effective_access($userid);
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_course_context());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
$usersummary = new assign_user_summary($user,
$this->get_course()->id,
$viewfullnames,
@@ -3746,7 +3746,7 @@ class assign {
$extensionduedate = $flags->extensionduedate;
}
$showedit = $this->submissions_open($userid) && ($this->is_any_submission_plugin_enabled());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_course_context());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
$usergroups = $this->get_all_groups($user->id);
$submissionstatus = new assign_submission_status($instance->allowsubmissionsfromdate,
@@ -3972,8 +3972,9 @@ class assign {
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
$markingallocationoptions[''] = get_string('filternone', 'assign');
$markingallocationoptions[ASSIGN_MARKER_FILTER_NO_MARKER] = get_string('markerfilternomarker', 'assign');
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->context);
foreach ($markers as $marker) {
$markingallocationoptions[$marker->id] = fullname($marker);
$markingallocationoptions[$marker->id] = fullname($marker, $viewfullnames);
}
}
@@ -4219,12 +4220,13 @@ class assign {
$uniqueid = $user->recordid;
}
if ($hasviewblind) {
return get_string('participant', 'assign') . ' ' . $uniqueid . ' (' . fullname($user) . ')';
return get_string('participant', 'assign') . ' ' . $uniqueid . ' (' .
fullname($user, has_capability('moodle/site:viewfullnames', $this->get_context())) . ')';
} else {
return get_string('participant', 'assign') . ' ' . $uniqueid;
}
} else {
return fullname($user);
return fullname($user, has_capability('moodle/site:viewfullnames', $this->get_context()));
}
}
@@ -4487,6 +4489,7 @@ class assign {
$usercount = 0;
$extrauserfields = get_extra_user_fields($this->get_context());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
foreach ($userlist as $userid) {
if ($usercount >= 5) {
$usershtml .= get_string('moreusers', 'assign', count($userlist) - 5);
@@ -4496,8 +4499,7 @@ class assign {
$usershtml .= $this->get_renderer()->render(new assign_user_summary($user,
$this->get_course()->id,
has_capability('moodle/site:viewfullnames',
$this->get_course_context()),
$viewfullnames,
$this->is_blind_marking(),
$this->get_uniqueid_for_user($user->id),
$extrauserfields,
@@ -4551,6 +4553,7 @@ class assign {
$usercount = 0;
$extrauserfields = get_extra_user_fields($this->get_context());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
foreach ($userlist as $userid) {
if ($usercount >= 5) {
$usershtml .= get_string('moreusers', 'assign', count($userlist) - 5);
@@ -4560,8 +4563,7 @@ class assign {
$usershtml .= $this->get_renderer()->render(new assign_user_summary($user,
$this->get_course()->id,
has_capability('moodle/site:viewfullnames',
$this->get_course_context()),
$viewfullnames,
$this->is_blind_marking(),
$this->get_uniqueid_for_user($user->id),
$extrauserfields,
@@ -4708,7 +4710,7 @@ class assign {
if ($flags) {
$extensionduedate = $flags->extensionduedate;
}
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_course_context());
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
$gradingstatus = $this->get_grading_status($user->id);
$usergroups = $this->get_all_groups($user->id);
@@ -4820,6 +4822,8 @@ class assign {
}
}
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
$feedbackstatus = new assign_feedback_status($gradefordisplay,
$gradeddate,
$grader,
@@ -4827,7 +4831,8 @@ class assign {
$grade,
$this->get_course_module()->id,
$this->get_return_action(),
$this->get_return_params());
$this->get_return_params(),
$viewfullnames);
return $feedbackstatus;
}
return;
@@ -7097,8 +7102,9 @@ class assign {
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
$markerlist = array('' => get_string('choosemarker', 'assign'));
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->context);
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);
$markerlist[$marker->id] = fullname($marker, $viewfullnames);
}
$mform->addElement('select', 'allocatedmarker', get_string('allocatedmarker', 'assign'), $markerlist);
$mform->addHelpButton('allocatedmarker', 'allocatedmarker', 'assign');
mod/assign/renderable.php
+6 -1
View File
@@ -287,6 +287,8 @@ class assign_feedback_status implements renderable {
public $returnaction = '';
/** @var array returnparams */
public $returnparams = array();
/** @var bool canviewfullnames */
public $canviewfullnames = false;
/**
* Constructor
@@ -298,6 +300,7 @@ class assign_feedback_status implements renderable {
* @param int $coursemoduleid
* @param string $returnaction The action required to return to this page
* @param array $returnparams The list of params required to return to this page
* @param bool $canviewfullnames
*/
public function __construct($gradefordisplay,
$gradeddate,
@@ -306,7 +309,8 @@ class assign_feedback_status implements renderable {
$grade,
$coursemoduleid,
$returnaction,
$returnparams) {
$returnparams,
$canviewfullnames) {
$this->gradefordisplay = $gradefordisplay;
$this->gradeddate = $gradeddate;
$this->grader = $grader;
@@ -315,6 +319,7 @@ class assign_feedback_status implements renderable {
$this->coursemoduleid = $coursemoduleid;
$this->returnaction = $returnaction;
$this->returnparams = $returnparams;
$this->canviewfullnames = $canviewfullnames;
}
}
mod/assign/renderer.php
+1 -1
View File
@@ -389,7 +389,7 @@ class mod_assign_renderer extends plugin_renderer_base {
$cell1 = new html_table_cell(get_string('gradedby', 'assign'));
$userdescription = $this->output->user_picture($status->grader) .
$this->output->spacer(array('width'=>30)) .
fullname($status->grader);
fullname($status->grader, $status->canviewfullnames);
$cell2 = new html_table_cell($userdescription);
$row->cells = array($cell1, $cell2);
$t->data[] = $row;