Merge branch 'MDL-86777-500' of https://github.com/paulholden/moodle into MOODLE_500_STABLE

customfield/amd/src/form.js

@@ -181,8 +181,7 @@ const editField = (element, component, area, itemid) => {
  */
 const getCategoryNameFor = nodeElement => nodeElement
     .closest('[data-category-id]')
-    .find('[data-inplaceeditable][data-itemtype=category][data-component=core_customfield]')
-    .attr('data-value');
+    .attr('data-category-name');
 
 const setupSortableLists = rootNode => {
     // Sort category.

customfield/classes/output/management.php

@@ -81,6 +81,7 @@ class management implements renderable, templatable {
 
             $categoryarray = array();
             $categoryarray['id'] = $category->get('id');
+            $categoryarray['name'] = $category->get_formatted_name();
             $categoryarray['nameeditable'] = $output->render(api::get_category_inplace_editable($category, true));
             $categoryarray['movetitle'] = get_string('movecategory', 'core_customfield',
                 $category->get_formatted_name());

customfield/externallib.php

@@ -118,6 +118,7 @@ class core_customfield_external extends external_api {
                     new external_single_structure(
                         array(
                             'id' => new external_value(PARAM_INT, 'id'),
+                            'name' => new external_value(PARAM_TEXT, 'name'),
                             'nameeditable' => new external_value(PARAM_RAW, 'inplace editable name'),
                             'addfieldmenu' => new external_value(PARAM_RAW, 'addfieldmenu'),
                             'fields' => new external_multiple_structure(

customfield/templates/list.mustache

@@ -42,6 +42,7 @@
       "canmovefields": 1,
       "categories": [
           { "id": "0",
+            "name": "Other fields",
             "nameeditable": "Other fields",
             "addfieldmenu": "Add field",
             "fields": [
@@ -50,6 +51,7 @@
             ]
           },
           { "id": "00",
+            "name": "Empty category",
             "nameeditable": "Empty category",
             "addfieldmenu": "Add field",
             "fields": [] }
@@ -75,7 +77,7 @@
 
     <div class="categorieslist">
     {{#categories}}
-        <div data-category-id="{{id}}" id="category-{{id}}" class="mt-2">
+        <div data-category-id="{{id}}" data-category-name="{{name}}" id="category-{{id}}" class="mt-2">
         <div class="row justify-content-between align-items-end">
             <div class="col-6 categoryinstance">
                 {{#usescategories}}