MDL-64506 grades: Fix regression of MDL-58428

This commit is contained in:
Mathew May
2019-04-03 19:34:20 +08:00
parent a5a6df54cc
commit b64bf2d77c
6 changed files with 22 additions and 121 deletions
+9 -11
View File
@@ -27,19 +27,17 @@
{{{table}}}
<div id="gradetreesubmit">
{{#showsave}}
<input class="advanced" type="submit" value={{#quote}}{{#str}}savechanges{{/str}}{{/quote}}>
<input class="advanced btn btn-primary" type="submit" value={{#quote}}{{#str}}savechanges{{/str}}{{/quote}}>
{{/showsave}}
{{#showbulkmove}}
<br><br>
<input type="hidden" name="bulkmove" value="0" id="bulkmoveinput">
<label for="menumoveafter">{{#str}}moveselectedto, grades{{/str}}</label>
<select name="moveafter" id="menumoveafter" class="ignoredirty singleselect select">
{{#bulkmoveoptions}}
<option value="{{value}}">{{name}}</option>
{{/bulkmoveoptions}}
</select>
<div id="noscriptgradetreeform" class="hiddenifjs">
<input type="submit" name={{#quote}}{{#str}}go{{/str}}{{/quote}}>
<div class="form-inline mt-3">
<input type="hidden" name="bulkmove" value="0" id="bulkmoveinput">
<label for="menumoveafter">{{#str}}moveselectedto, grades{{/str}}</label>
<select name="moveafter" id="menumoveafter" class="ignoredirty singleselect select form-control">
{{#bulkmoveoptions}}
<option value="{{value}}">{{name}}</option>
{{/bulkmoveoptions}}
</select>
</div>
{{/showbulkmove}}
</div>
+1 -1
View File
@@ -20,4 +20,4 @@
<label class="accesshide" for="weight_{{id}}">
{{#str}}extracreditvalue, grades, {{itemname}}{{/str}}
</label>
<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="6">
<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="4" class="form-control">
+12 -10
View File
@@ -15,15 +15,17 @@
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
Weight override field.
Weight field.
}}
<label class="accesshide" for="weightoverride_{{id}}">
{{#str}}overrideweightofa, grades, {{itemname}}{{/str}}
</label>
<input type="hidden" name="weightoverride_{{id}}" value="0">
<input type="checkbox" name="weightoverride_{{id}}" id="weightoverride_{{id}}" value="1" class="weightoverride" {{#checked}}checked{{/checked}}>
<div class="form-inline">
<label class="accesshide" for="weightoverride_{{id}}">
{{#str}}overrideweightofa, grades, {{itemname}}{{/str}}
</label>
<input type="hidden" name="weightoverride_{{id}}" value="0">
<input type="checkbox" name="weightoverride_{{id}}" id="weightoverride_{{id}}" value="1" class="weightoverride" {{#checked}}checked{{/checked}}>
<label class="accesshide" for="weight_{{id}}">
{{#str}}weightofa, grades, {{itemname}}{{/str}}
</label>
<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="6" {{#disabled}}disabled{{/disabled}}>
<label class="accesshide" for="weight_{{id}}">
{{#str}}weightofa, grades, {{itemname}}{{/str}}
</label>
<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="4" {{#disabled}}disabled{{/disabled}} class="form-control">
</div>
-45
View File
@@ -1,45 +0,0 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
Edit tree.
}}
<form id="gradetreeform" method="post" action="{{actionurl}}">
<div>
<input type="hidden" name="sesskey" value="{{sesskey}}">
{{#notification}}
{{>core/notification_info}}
{{/notification}}
{{{table}}}
<div id="gradetreesubmit">
{{#showsave}}
<input class="advanced btn btn-primary" type="submit" value={{#quote}}{{#str}}savechanges{{/str}}{{/quote}}>
{{/showsave}}
{{#showbulkmove}}
<div class="form-inline mt-3">
<input type="hidden" name="bulkmove" value="0" id="bulkmoveinput">
<label for="menumoveafter">{{#str}}moveselectedto, grades{{/str}}</label>
<select name="moveafter" id="menumoveafter" class="ignoredirty singleselect select form-control">
{{#bulkmoveoptions}}
<option value="{{value}}">{{name}}</option>
{{/bulkmoveoptions}}
</select>
</div>
{{/showbulkmove}}
</div>
</div>
</form>
-23
View File
@@ -1,23 +0,0 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
Weight field.
}}
<label class="accesshide" for="weight_{{id}}">
{{#str}}extracreditvalue, grades, {{itemname}}{{/str}}
</label>
<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="4" class="form-control">
@@ -1,31 +0,0 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
Weight field.
}}
<div class="form-inline">
<label class="accesshide" for="weightoverride_{{id}}">
{{#str}}overrideweightofa, grades, {{itemname}}{{/str}}
</label>
<input type="hidden" name="weightoverride_{{id}}" value="0">
<input type="checkbox" name="weightoverride_{{id}}" id="weightoverride_{{id}}" value="1" class="weightoverride" {{#checked}}checked{{/checked}}>
<label class="accesshide" for="weight_{{id}}">
{{#str}}weightofa, grades, {{itemname}}{{/str}}
</label>
<input type="text" name="weight_{{id}}" id="weight_{{id}}" value="{{value}}" size="4" {{#disabled}}disabled{{/disabled}} class="form-control">
</div>