Merge branch 'MDL-59436-master' of git://github.com/junpataleta/moodle

user/classes/participants_table.php

@@ -146,14 +146,6 @@ class participants_table extends \table_sql {
         }
 
         // Do not show the columns if it exists in the hiddenfields array.
-        if (!isset($hiddenfields['city'])) {
-            $headers[] = get_string('city');
-            $columns[] = 'city';
-        }
-        if (!isset($hiddenfields['country'])) {
-            $headers[] = get_string('country');
-            $columns[] = 'country';
-        }
         if (!isset($hiddenfields['lastaccess'])) {
             if ($courseid == SITEID) {
                 $headers[] = get_string('lastsiteaccess');
@@ -166,6 +158,9 @@ class participants_table extends \table_sql {
         $this->define_columns($columns);
         $this->define_headers($headers);
 
+        // Make this table sorted by first name by default.
+        $this->sortable(true, 'firstname');
+
         $this->no_sorting('select');
 
         $this->set_attribute('id', 'participants');
@@ -228,16 +223,6 @@ class participants_table extends \table_sql {
         return $OUTPUT->render_from_template('core/inplace_editable', $editable->export_for_template($OUTPUT));
     }
 
-    /**
-     * Generate the city column.
-     *
-     * @param \stdClass $data
-     * @return string
-     */
-    public function col_city($data) {
-        return $data->city;
-    }
-
     /**
      * Generate the country column.
      *