Skip to content

Commit

Permalink
MDL-40843 workshop: show user names in recent activity
Browse files Browse the repository at this point in the history
  • Loading branch information
@marinaglancy
marinaglancy committed Apr 4, 2014
1 parent b0bbb67 commit 2a91ea9
Showing 1 changed file with 26 additions and 31 deletions.
57 changes: 26 additions & 31 deletions mod/workshop/lib.php
View file
Expand Up @@ -401,16 +401,14 @@ function workshop_print_recent_activity($course, $viewfullnames, $timestart) {
continue;
}

if ($viewfullnames) {
// remember all user names we can use later
if (empty($users[$activity->authorid])) {
$u = new stdclass();
$users[$activity->authorid] = username_load_fields_from_object($u, $activity, 'author');
}
if ($activity->reviewerid and empty($users[$activity->reviewerid])) {
$u = new stdclass();
$users[$activity->reviewerid] = username_load_fields_from_object($u, $activity, 'reviewer');
}
// remember all user names we can use later
if (empty($users[$activity->authorid])) {
$u = new stdclass();
$users[$activity->authorid] = username_load_fields_from_object($u, $activity, 'author');
}
if ($activity->reviewerid and empty($users[$activity->reviewerid])) {
$u = new stdclass();
$users[$activity->reviewerid] = username_load_fields_from_object($u, $activity, 'reviewer');
}

$context = context_module::instance($cm->id);
Expand All @@ -422,7 +420,7 @@ function workshop_print_recent_activity($course, $viewfullnames, $timestart) {
$s->authorid = $activity->authorid;
$s->timemodified = $activity->submissionmodified;
$s->cmid = $activity->cmid;
if (has_capability('mod/workshop:viewauthornames', $context)) {
if ($activity->authorid == $USER->id || has_capability('mod/workshop:viewauthornames', $context)) {
$s->authornamevisible = true;
} else {
$s->authornamevisible = false;
Expand Down Expand Up @@ -475,7 +473,7 @@ function workshop_print_recent_activity($course, $viewfullnames, $timestart) {
$a->reviewerid = $activity->reviewerid;
$a->timemodified = $activity->assessmentmodified;
$a->cmid = $activity->cmid;
if (has_capability('mod/workshop:viewreviewernames', $context)) {
if ($activity->reviewerid == $USER->id || has_capability('mod/workshop:viewreviewernames', $context)) {
$a->reviewernamevisible = true;
} else {
$a->reviewernamevisible = false;
Expand Down Expand Up @@ -530,7 +528,7 @@ function workshop_print_recent_activity($course, $viewfullnames, $timestart) {
echo $OUTPUT->heading(get_string('recentsubmissions', 'workshop'), 3);
foreach ($submissions as $id => $submission) {
$link = new moodle_url('/mod/workshop/submission.php', array('id'=>$id, 'cmid'=>$submission->cmid));
if ($viewfullnames and $submission->authornamevisible) {
if ($submission->authornamevisible) {
$author = $users[$submission->authorid];
} else {
$author = null;
Expand All @@ -544,7 +542,7 @@ function workshop_print_recent_activity($course, $viewfullnames, $timestart) {
echo $OUTPUT->heading(get_string('recentassessments', 'workshop'), 3);
foreach ($assessments as $id => $assessment) {
$link = new moodle_url('/mod/workshop/assessment.php', array('asid' => $id));
if ($viewfullnames and $assessment->reviewernamevisible) {
if ($assessment->reviewernamevisible) {
$reviewer = $users[$assessment->reviewerid];
} else {
$reviewer = null;
Expand Down Expand Up @@ -635,7 +633,6 @@ function workshop_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$context = context_module::instance($cm->id);
$grader = has_capability('moodle/grade:viewall', $context);
$accessallgroups = has_capability('moodle/site:accessallgroups', $context);
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
$viewauthors = has_capability('mod/workshop:viewauthornames', $context);
$viewreviewers = has_capability('mod/workshop:viewreviewernames', $context);

Expand All @@ -645,20 +642,18 @@ function workshop_get_recent_mod_activity(&$activities, &$index, $timestart, $co

foreach ($rs as $activity) {

if ($viewfullnames) {
// remember all user names we can use later
if (empty($users[$activity->authorid])) {
$u = new stdclass();
$additionalfields = explode(',', user_picture::fields());
$u = username_load_fields_from_object($u, $activity, 'author', $additionalfields);
$users[$activity->authorid] = $u;
}
if ($activity->reviewerid and empty($users[$activity->reviewerid])) {
$u = new stdclass();
$additionalfields = explode(',', user_picture::fields());
$u = username_load_fields_from_object($u, $activity, 'reviewer', $additionalfields);
$users[$activity->reviewerid] = $u;
}
// remember all user names we can use later
if (empty($users[$activity->authorid])) {
$u = new stdclass();
$additionalfields = explode(',', user_picture::fields());
$u = username_load_fields_from_object($u, $activity, 'author', $additionalfields);
$users[$activity->authorid] = $u;
}
if ($activity->reviewerid and empty($users[$activity->reviewerid])) {
$u = new stdclass();
$additionalfields = explode(',', user_picture::fields());
$u = username_load_fields_from_object($u, $activity, 'reviewer', $additionalfields);
$users[$activity->reviewerid] = $u;
}

if ($activity->submissionmodified > $timestart and empty($submissions[$activity->submissionid])) {
Expand All @@ -667,7 +662,7 @@ function workshop_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$s->title = $activity->submissiontitle;
$s->authorid = $activity->authorid;
$s->timemodified = $activity->submissionmodified;
if (has_capability('mod/workshop:viewauthornames', $context)) {
if ($activity->authorid == $USER->id || has_capability('mod/workshop:viewauthornames', $context)) {
$s->authornamevisible = true;
} else {
$s->authornamevisible = false;
Expand Down Expand Up @@ -720,7 +715,7 @@ function workshop_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$a->submissiontitle = $activity->submissiontitle;
$a->reviewerid = $activity->reviewerid;
$a->timemodified = $activity->assessmentmodified;
if (has_capability('mod/workshop:viewreviewernames', $context)) {
if ($activity->reviewerid == $USER->id || has_capability('mod/workshop:viewreviewernames', $context)) {
$a->reviewernamevisible = true;
} else {
$a->reviewernamevisible = false;
Expand Down

0 comments on commit 2a91ea9

Please sign in to comment.