Browse Source

Fix #546 - don't include custom fields.

also fix github action config var.
40-behatfixes
Dan Marsden 3 years ago
parent
commit
70108744d4
  1. 2
      .github/workflows/moodle-release.yml
  2. 2
      classes/structure.php

2
.github/workflows/moodle-release.yml

@ -121,7 +121,7 @@ jobs:
FUNCTION: local_plugins_add_version FUNCTION: local_plugins_add_version
run: | run: |
ZIPURL="https://github.com/danmarsden/moodle-mod_attendance/archive/refs/heads/{BRANCH}.zip" ZIPURL="https://github.com/danmarsden/moodle-mod_attendance/archive/refs/heads/${BRANCH}.zip"
RESPONSE=$(${CURL} ${ENDPOINT} --data-urlencode "wstoken=${TOKEN}" \ RESPONSE=$(${CURL} ${ENDPOINT} --data-urlencode "wstoken=${TOKEN}" \
--data-urlencode "wsfunction=${FUNCTION}" \ --data-urlencode "wsfunction=${FUNCTION}" \
--data-urlencode "moodlewsrestformat=json" \ --data-urlencode "moodlewsrestformat=json" \

2
classes/structure.php

@ -805,7 +805,7 @@ class mod_attendance_structure {
global $DB; global $DB;
$fields = array('username' , 'idnumber' , 'institution' , 'department', 'city', 'country'); $fields = array('username' , 'idnumber' , 'institution' , 'department', 'city', 'country');
$userf = \core_user\fields::for_identity($this->context)->with_userpic()->including(...$fields); $userf = \core_user\fields::for_identity($this->context, false)->with_userpic()->including(...$fields);
$userfields = $userf->get_sql('u', false, '', 'id', false)->selects; $userfields = $userf->get_sql('u', false, '', 'id', false)->selects;
if (empty($this->pageparams->sort)) { if (empty($this->pageparams->sort)) {

Loading…
Cancel
Save