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

NoelDeMartin · May 13, 2016 · 07d4b49 · 07d4b49
2 parents 378733a + 32cf4bc
commit 07d4b49
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 41 deletions.
diff --git a/admin/tool/lp/classes/form/competency.php b/admin/tool/lp/classes/form/competency.php
@@ -102,7 +102,7 @@ public function definition() {
         $mform->setType('description', PARAM_RAW);
         // ID number.
         $mform->addElement('text', 'idnumber', get_string('idnumber', 'tool_lp'), 'maxlength="100"');
-        $mform->setType('idnumber', PARAM_TEXT);
+        $mform->setType('idnumber', PARAM_RAW);
         $mform->addRule('idnumber', null, 'required', null, 'client');
         $mform->addRule('idnumber', get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
 

diff --git a/admin/tool/lp/classes/form/competency_framework.php b/admin/tool/lp/classes/form/competency_framework.php
@@ -65,7 +65,7 @@ public function definition() {
         $mform->setType('description', PARAM_RAW);
         // ID number.
         $mform->addElement('text', 'idnumber', get_string('idnumber', 'tool_lp'), 'maxlength="100"');
-        $mform->setType('idnumber', PARAM_TEXT);
+        $mform->setType('idnumber', PARAM_RAW);
         $mform->addRule('idnumber', null, 'required', null, 'client');
         $mform->addRule('idnumber', get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
 

diff --git a/admin/tool/lp/templates/competencies_move_tree.mustache b/admin/tool/lp/templates/competencies_move_tree.mustache
@@ -31,7 +31,7 @@
 
 <ul data-enhance="movetree" style="display: none;">
     <li>
-        <span>{{framework.shortname}}</span>
+        <span>{{{framework.shortname}}}</span>
         <ul>
             {{#competencies}}
                 {{> tool_lp/competencies_tree }}

diff --git a/admin/tool/lp/templates/competencies_tree.mustache b/admin/tool/lp/templates/competencies_tree.mustache
@@ -1,12 +1,12 @@
 <li data-id="{{id}}">
     {{#canmanage}}
     <span draggable="true">
-        {{shortname}}
+        {{{shortname}}}
     </span>
     {{/canmanage}}
     {{^canmanage}}
     <span>
-        {{shortname}}
+        {{{shortname}}}
     </span>
     {{/canmanage}}
     {{#haschildren}}

diff --git a/admin/tool/lp/templates/competencies_tree_root.mustache b/admin/tool/lp/templates/competencies_tree_root.mustache
@@ -1,5 +1,5 @@
 <ul data-enhance="tree">
-    <li><span>{{shortname}}</span>
+    <li><span>{{{shortname}}}</span>
         <ul>
             {{#competencies}}
                 {{> tool_lp/competencies_tree }}

diff --git a/admin/tool/lp/templates/competency_path.mustache b/admin/tool/lp/templates/competency_path.mustache
@@ -39,10 +39,10 @@
 }}
 <nav id="competency-path-{{uniqid}}">
     <small>
-        <a href="{{pluginbaseurl}}/competencies.php?competencyframeworkid={{framework.id}}&pagecontextid={{pagecontextid}}" >{{framework.name}}</a>
+        <a href="{{pluginbaseurl}}/competencies.php?competencyframeworkid={{framework.id}}&pagecontextid={{pagecontextid}}" >{{{framework.name}}}</a>
         /
         {{#ancestors}}
-            <a data-action="competency-dialogue" href="#" data-id="{{id}}">{{name}}</a>
+            <a data-action="competency-dialogue" href="#" data-id="{{id}}">{{{name}}}</a>
             {{^last}}<span> / </span>{{/last}}
         {{/ancestors}}
     </small>

diff --git a/admin/tool/lp/templates/competency_picker.mustache b/admin/tool/lp/templates/competency_picker.mustache
@@ -3,7 +3,7 @@
 <h3>{{#str}}competencyframeworks, tool_lp{{/str}}</h3>
 <select data-action="chooseframework">
 {{#frameworks}}
-<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{shortname}} <em>{{idnumber}}</em></option>
+<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{{shortname}}} <em>{{idnumber}}</em></option>
 {{/frameworks}}
 </select>
 {{/singleFramework}}
@@ -15,7 +15,7 @@
     <button>{{#pix}}a/search, ,{{#str}}search{{/str}}{{/pix}}</button>
 </form>
 <ul data-enhance="linktree" style="display: none;">
-    <li><span>{{framework.shortname}}</span>
+    <li><span>{{{framework.shortname}}}</span>
         <ul>
             {{#competencies}}
                 {{> tool_lp/competencies_tree }}

diff --git a/admin/tool/lp/templates/competency_picker_competencyform.mustache b/admin/tool/lp/templates/competency_picker_competencyform.mustache
@@ -7,7 +7,7 @@
     <button>{{#pix}}a/search, ,{{#str}}search{{/str}}{{/pix}}</button>
 </form>
 <ul data-enhance="linktree" style="display: none;">
-    <li data-id="0"><span>{{framework.shortname}}</span>
+    <li data-id="0"><span>{{{framework.shortname}}}</span>
         <ul>
             {{#competencies}}
                 {{> tool_lp/competencies_tree }}

diff --git a/admin/tool/lp/templates/competency_plan_navigation.mustache b/admin/tool/lp/templates/competency_plan_navigation.mustache
@@ -4,7 +4,7 @@
 <label for="competency-nav-{{uniqid}}" class="accesshide">{{#str}}jumptocompetency, tool_lp{{/str}}</label>
 <select id="competency-nav-{{uniqid}}">
 {{#competencies}}
-<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{shortname}} {{idnumber}}</option>
+<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{{shortname}}} {{idnumber}}</option>
 {{/competencies}}
 </select>
 </span>

diff --git a/admin/tool/lp/templates/competency_rule_points.mustache b/admin/tool/lp/templates/competency_rule_points.mustache
@@ -10,9 +10,15 @@
         <tbody>
             {{#children}}
             <tr data-competency="{{id}}">
-                <th scope="row">{{shortname}}</th>
-                <td><input type="number" min="0" value="{{points}}" name="points" aria-label="{{#str}}pointsgivenfor, tool_lp, {{competency.shortname}}{{/str}}"></td>
-                <td><input type="checkbox" value="1" name="required" {{#required}}checked{{/required}} aria-label="{{#str}}aisrequired, tool_lp, {{competency.shortname}}{{/str}}"></td>
+                <th scope="row">{{{shortname}}}</th>
+                <td>
+                    <label class="accesshide" for="pointsforcompetency-{{id}}">{{#str}}pointsgivenfor, tool_lp, {{{competency.shortname}}}{{/str}}</label>
+                    <input id="pointsforcompetency-{{id}}" type="number" min="0" value="{{points}}" name="points" />
+                </td>
+                <td>
+                    <label class="accesshide" for="competency-{{id}}-isrequired">{{#str}}aisrequired, tool_lp, {{{competency.shortname}}}{{/str}}</label>
+                    <input id="competency-{{id}}-isrequired" type="checkbox" value="1" name="required" {{#required}}checked{{/required}} />
+                </td>
             </tr>
             {{/children}}
         </tbody>

diff --git a/admin/tool/lp/templates/competency_summary.mustache b/admin/tool/lp/templates/competency_summary.mustache
@@ -1,10 +1,10 @@
 <div class='competency-heading'>
-    <h4 id="competency_link_{{competency.id}}">{{competency.shortname}}
+    <h4 id="competency_link_{{competency.id}}">{{{competency.shortname}}}
         <small>{{competency.idnumber}}</small>
     </h4>
     {{#framework}}
         <div class='competency-origin'>
-            <p><small>{{framework.shortname}} - {{taxonomyterm}}</small>
+            <p><small>{{{framework.shortname}}} - {{taxonomyterm}}</small>
         </div>
     {{/framework}}
 </div>

diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache
@@ -66,7 +66,7 @@
             <a href="{{pluginbaseurl}}user_competency_in_course.php?courseid={{courseid}}&competencyid={{competency.id}}&userid={{gradableuserid}}"
                    id="competency-info-link-{{competency.id}}"
                    title="{{#str}}viewdetails, tool_lp{{/str}}">
-                <p><strong>{{competency.shortname}} <em>{{competency.idnumber}}</em></strong></p>
+                <p><strong>{{{competency.shortname}}} <em>{{competency.idnumber}}</em></strong></p>
             </a>
             <p>{{{competency.description}}}</p>
         {{/competency}}

diff --git a/admin/tool/lp/templates/course_competency_statistics.mustache b/admin/tool/lp/templates/course_competency_statistics.mustache
@@ -68,7 +68,7 @@
         <div>
             {{#leastproficient}}
                 <a href="#competency-info-link-{{id}}">
-                <div><p>{{shortname}} <em>{{idnumber}}</em></p></div>
+                <div><p>{{{shortname}}} <em>{{idnumber}}</em></p></div>
                 </a>
             {{/leastproficient}}
         </div>

diff --git a/admin/tool/lp/templates/manage_competencies_page.mustache b/admin/tool/lp/templates/manage_competencies_page.mustache
@@ -32,7 +32,7 @@
 }}
 <div data-region="managecompetencies">
 <h2>
-    {{framework.shortname}}
+    {{{framework.shortname}}}
     {{#canmanage}}
             <a href="{{pluginbaseurl}}/editcompetencyframework.php?id={{framework.id}}&pagecontextid={{pagecontextid}}&return=competencies">{{#pix}}t/edit, core, {{#str}}editcompetencyframework, tool_lp{{/str}}{{/pix}}</a>
     {{/canmanage}}
@@ -121,7 +121,7 @@ require(['tool_lp/tree', 'tool_lp/competencytree', 'tool_lp/competencyactions',
         function(ariatree, treeModel, actions, $) {
 
     treeModel.init({{framework.id}},
-                   '{{framework.shortname}}',
+                   {{#quote}} {{{framework.shortname}}} {{/quote}},
                    '{{search}}',
                    '[data-enhance=tree]',
                    {{canmanage}});

diff --git a/admin/tool/lp/templates/manage_competency_frameworks_page.mustache b/admin/tool/lp/templates/manage_competency_frameworks_page.mustache
@@ -52,7 +52,7 @@
     <tbody class="drag-parentnode">
         {{#competencyframeworks}}
         <tr class="drag-samenode" data-frameworkid="{{id}}">
-            <td><span class="drag-handlecontainer"></span><span><a href="{{pluginbaseurl}}/competencies.php?competencyframeworkid={{id}}&amp;pagecontextid={{pagecontextid}}">{{shortname}} ({{idnumber}})</a></span> {{^visible}}{{#str}}hiddenhint, tool_lp{{/str}}{{/visible}}</td>
+            <td><span class="drag-handlecontainer"></span><span><a href="{{pluginbaseurl}}/competencies.php?competencyframeworkid={{id}}&amp;pagecontextid={{pagecontextid}}">{{{shortname}}} ({{idnumber}})</a></span> {{^visible}}{{#str}}hiddenhint, tool_lp{{/str}}{{/visible}}</td>
             <td>{{competenciescount}}</td>
             <td>{{contextnamenoprefix}}</td>
             <td>

diff --git a/admin/tool/lp/templates/manage_templates_page.mustache b/admin/tool/lp/templates/manage_templates_page.mustache
@@ -53,7 +53,7 @@
     <tbody class="drag-parentnode">
         {{#templates}}
         <tr class="drag-samenode" data-templateid="{{id}}">
-            <td><a href="{{pluginbaseurl}}/templatecompetencies.php?templateid={{id}}&amp;pagecontextid={{pagecontextid}}">{{shortname}}</a></span> {{^visible}}{{#str}}hiddenhint, tool_lp{{/str}}{{/visible}}</td>
+            <td><a href="{{pluginbaseurl}}/templatecompetencies.php?templateid={{id}}&amp;pagecontextid={{pagecontextid}}">{{{shortname}}}</a></span> {{^visible}}{{#str}}hiddenhint, tool_lp{{/str}}{{/visible}}</td>
             <td>{{contextnamenoprefix}}</td>
             <td><a class="template-cohorts" href="{{pluginbaseurl}}/template_cohorts.php?id={{id}}&amp;pagecontextid={{pagecontextid}}">{{cohortscount}}</a></td>
             <td><a class="template-userplans" href="{{pluginbaseurl}}/template_plans.php?id={{id}}&amp;pagecontextid={{pagecontextid}}">{{planscount}}</a></td>

diff --git a/admin/tool/lp/templates/plan_page.mustache b/admin/tool/lp/templates/plan_page.mustache
@@ -19,7 +19,7 @@
 }}
 <div data-region="plan-page" data-id="{{plan.id}}" data-userid="{{plan.userid}}">
     <h2>
-        {{plan.name}}
+        {{{plan.name}}}
         {{#plan.canbeedited}}
             <a href="{{pluginbaseurl}}/editplan.php?id={{plan.id}}&amp;userid={{plan.userid}}">{{#pix}}t/edit, core, {{#str}}editplan, tool_lp{{/str}}{{/pix}}</a>
         {{/plan.canbeedited}}
@@ -79,7 +79,7 @@
                     {{#canread}}
                         <a href="{{pluginbaseurl}}/templatecompetencies.php?templateid={{id}}&amp;pagecontextid={{contextid}}">
                     {{/canread}}
-                    {{plan.template.shortname}}{{#canread}}</a>{{/canread}}
+                    {{{plan.template.shortname}}}{{#canread}}</a>{{/canread}}
                     {{#plan.isunlinkallowed}}
                         (<a data-action="plan-unlink" href="#">{{#str}}unlinkplantemplate, tool_lp{{/str}}</a>)
                     {{/plan.isunlinkallowed}}
@@ -135,7 +135,7 @@
                         {{#plan.canbeedited}}
                         <span class="drag-handlecontainer pull-left"></span>
                         {{/plan.canbeedited}}
-                        <a data-usercompetency="true" href="#">{{competency.shortname}}</a>
+                        <a data-usercompetency="true" href="#">{{{competency.shortname}}}</a>
                         <em>{{competency.idnumber}}</em>
                         {{#comppath}}
                             <br>

diff --git a/admin/tool/lp/templates/plans_page.mustache b/admin/tool/lp/templates/plans_page.mustache
@@ -53,7 +53,7 @@
         {{#plans}}
         <tr data-region="plan-node" data-id="{{id}}" data-userid="{{userid}}">
             <td>
-                <span><a href="{{pluginbaseurl}}/plan.php?id={{id}}">{{name}}</a></span>
+                <span><a href="{{pluginbaseurl}}/plan.php?id={{id}}">{{{name}}}</a></span>
             </td>
              <td>
                {{#isbasedontemplate}}

diff --git a/admin/tool/lp/templates/related_competencies.mustache b/admin/tool/lp/templates/related_competencies.mustache
@@ -12,7 +12,7 @@
             {{/showdeleterelatedaction}}
             <p>
                 <a href="#" data-action="competency-dialogue" data-id="{{id}}">
-                    {{shortname}}{{#idnumber}} {{idnumber}}{{/idnumber}}
+                    {{{shortname}}}{{#idnumber}} {{idnumber}}{{/idnumber}}
                 </a>
             </p>
         </li>

diff --git a/admin/tool/lp/templates/template_competencies_page.mustache b/admin/tool/lp/templates/template_competencies_page.mustache
@@ -19,7 +19,7 @@
 }}
 <div data-region="templatecompetenciespage">
     <h2>
-        {{template.shortname}}
+        {{{template.shortname}}}
         {{#template.canmanage}}
             <a href="{{pluginbaseurl}}/edittemplate.php?id={{template.id}}&amp;pagecontextid={{pagecontextid}}">{{#pix}}t/edit, core, {{#str}}edittemplate, tool_lp{{/str}}{{/pix}}</a>
         {{/template.canmanage}}
@@ -55,7 +55,7 @@
                         {{#hascourses}}
                         <ul class="inline">
                         {{#linkedcourses}}
-                            <li><a href="{{viewurl}}?id={{id}}">{{fullname}} ({{shortname}})</a></li>
+                            <li><a href="{{viewurl}}?id={{id}}">{{fullname}} ({{{shortname}}})</a></li>
                         {{/linkedcourses}}
                         </ul>
                         {{/hascourses}}

diff --git a/admin/tool/lp/templates/template_statistics.mustache b/admin/tool/lp/templates/template_statistics.mustache
@@ -101,7 +101,7 @@
                 {{#showcompetencylinks}}
                 <a href="#competency_link_{{id}}">
                 {{/showcompetencylinks}}
-                <div><p>{{shortname}} <em>{{idnumber}}</em></p></div>
+                <div><p>{{{shortname}}} <em>{{idnumber}}</em></p></div>
                 {{#showcompetencylinks}}
                 </a>
                 {{/showcompetencylinks}}

diff --git a/admin/tool/lp/templates/user_competency_course_navigation.mustache b/admin/tool/lp/templates/user_competency_course_navigation.mustache
@@ -17,7 +17,7 @@
 <label for="competency-nav-{{uniqid}}" class="accesshide">{{#str}}jumptocompetency, tool_lp{{/str}}</label>
 <select id="competency-nav-{{uniqid}}">
 {{#competencies}}
-<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{shortname}} {{idnumber}}</option>
+<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{{shortname}}} {{idnumber}}</option>
 {{/competencies}}
 </select>
 </span>

diff --git a/admin/tool/lp/templates/user_evidence_list_page.mustache b/admin/tool/lp/templates/user_evidence_list_page.mustache
@@ -53,7 +53,7 @@
     <tbody>
         {{#evidence}}
         <tr data-region='user-evidence-node' data-id="{{id}}" data-userid="{{userid}}">
-            <td><a href="{{pluginbaseurl}}/user_evidence.php?id={{id}}">{{name}}</a></td>
+            <td><a href="{{pluginbaseurl}}/user_evidence.php?id={{id}}">{{{name}}}</a></td>
             <td>
                 {{^hasurlorfiles}}
                     -
@@ -77,7 +77,7 @@
                     <ul class="user-evidence-competencies">
                     {{#usercompetencies}}
                         <li>
-                            {{competency.shortname}} <small><em>{{competency.idnumber}}</em></small> ({{usercompetency.statusname}}{{#usercompetency.reviewer.fullname}} / {{usercompetency.reviewer.fullname}}{{/usercompetency.reviewer.fullname}})
+                            {{{competency.shortname}}} <small><em>{{competency.idnumber}}</em></small> ({{usercompetency.statusname}}{{#usercompetency.reviewer.fullname}} / {{usercompetency.reviewer.fullname}}{{/usercompetency.reviewer.fullname}})
                         </li>
                     {{/usercompetencies}}
                     </ul>

diff --git a/admin/tool/lp/templates/user_evidence_page.mustache b/admin/tool/lp/templates/user_evidence_page.mustache
@@ -31,7 +31,7 @@
 {{#userevidence}}
 <div data-region="user-evidence-page" data-id="{{id}}" data-userid="{{userid}}">
     <h2>
-        {{name}}
+        {{{name}}}
         {{#canmanage}}
             <a href="{{pluginbaseurl}}/user_evidence_edit.php?id={{id}}&amp;userid={{userid}}">{{#pix}}t/edit, core, {{#str}}editthisuserevidence, tool_lp{{/str}}{{/pix}}</a>
         {{/canmanage}}
@@ -78,7 +78,7 @@
                 {{#usercompetencies}}
                 <tr data-id="{{competency.id}}">
                     <td>
-                        <a href="{{pluginbaseurl}}/user_competency.php?id={{usercompetency.id}}" data-id="{{usercompetency.id}}">{{competency.shortname}}</a>
+                        <a href="{{pluginbaseurl}}/user_competency.php?id={{usercompetency.id}}" data-id="{{usercompetency.id}}">{{{competency.shortname}}}</a>
                     </td>
                      <td>
                         {{usercompetency.statusname}} {{#usercompetency.reviewer.fullname}} / {{usercompetency.reviewer.fullname}}{{/usercompetency.reviewer.fullname}}

diff --git a/admin/tool/lpmigrate/templates/migrate_frameworks_results.mustache b/admin/tool/lpmigrate/templates/migrate_frameworks_results.mustache
@@ -110,7 +110,7 @@
     <h4>{{#str}}unmappedin, tool_lpmigrate, {{frameworkfrom.shortname}}{{/str}}</h4>
     <ul>
         {{#unmappedfrom}}
-            <li><a href="#" data-id="{{id}}" data-action="competency-dialogue" data-includecourses="true">{{shortname}}</a> <em>{{idnumber}}</em></li>
+            <li><a href="#" data-id="{{id}}" data-action="competency-dialogue" data-includecourses="true">{{{shortname}}}</a> <em>{{idnumber}}</em></li>
         {{/unmappedfrom}}
     </ul>
     {{/hasunmappedfrom}}
@@ -119,7 +119,7 @@
     <h4>{{#str}}unmappedin, tool_lpmigrate, {{frameworkto.shortname}}{{/str}}</h4>
     <ul>
         {{#unmappedto}}
-            <li><a href="#" data-id="{{id}}" data-action="competency-dialogue" data-includecourses="true">{{shortname}}</a> <em>{{idnumber}}</em></li>
+            <li><a href="#" data-id="{{id}}" data-action="competency-dialogue" data-includecourses="true">{{{shortname}}}</a> <em>{{idnumber}}</em></li>
         {{/unmappedto}}
     </ul>
     {{/hasunmappedto}}

diff --git a/competency/classes/competency.php b/competency/classes/competency.php
@@ -64,7 +64,7 @@ protected static function define_properties() {
                 'type' => PARAM_TEXT
             ),
             'idnumber' => array(
-                'type' => PARAM_TEXT
+                'type' => PARAM_RAW
             ),
             'description' => array(
                 'default' => '',

diff --git a/competency/classes/competency_framework.php b/competency/classes/competency_framework.php
@@ -87,7 +87,7 @@ protected static function define_properties() {
                 'type' => PARAM_TEXT
             ),
             'idnumber' => array(
-                'type' => PARAM_TEXT
+                'type' => PARAM_RAW
             ),
             'description' => array(
                 'type' => PARAM_RAW,

diff --git a/report/competency/templates/report.mustache b/report/competency/templates/report.mustache
@@ -30,7 +30,7 @@
             {{#competency}}
             <td>
                 <a href="#" data-action="competency-dialogue" data-id="{{competency.id}}">
-                    {{competency.shortname}} <em data-id="{{competency.id}}">{{competency.idnumber}}</em>
+                    {{{competency.shortname}}} <em data-id="{{competency.id}}">{{competency.idnumber}}</em>
                 </a>
             </td>
             {{/competency}}