Merge branch 'MDL-65260' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 1 May 2019 02:22:32 +0000 (10:22 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 1 May 2019 02:22:32 +0000 (10:22 +0800)
1  2 
enrol/renderer.php

diff --combined enrol/renderer.php
@@@ -41,7 -41,7 +41,7 @@@ class core_enrol_renderer extends plugi
                              'value'    => $button->label,
                              'disabled' => $button->disabled ? 'disabled' : null,
                              'title'    => $button->tooltip,
 -                            'class'    => 'btn btn-secondary m-y-1');
 +                            'class'    => 'btn btn-secondary my-1');
  
          if ($button->actions) {
              $id = html_writer::random_id('single_button');
@@@ -353,7 -353,8 +353,8 @@@ class course_enrolment_table extends ht
       * @var array
       */
      protected static $sortablefields = array('firstname', 'lastname', 'firstnamephonetic', 'lastnamephonetic', 'middlename',
-             'alternatename', 'idnumber', 'email', 'phone1', 'phone2', 'institution', 'department', 'lastaccess', 'lastcourseaccess' );
+             'alternatename', 'username', 'idnumber', 'email', 'phone1', 'phone2',
+             'institution', 'department', 'lastaccess', 'lastcourseaccess');
  
      /**
       * Constructs the table