Details
-
Type:
Task
-
Status: Closed
-
Priority:
Minor
-
Resolution: Fixed
-
Affects Version/s: 2.2.3, 2.5
-
Fix Version/s: None
-
Component/s: Libraries
-
Labels:
-
Testing Instructions:
-
Affected Branches:MOODLE_22_STABLE, MOODLE_25_STABLE
-
Pull from Repository:
-
Pull Master Branch:wip-
MDL-33774-master -
Pull Master Diff URL:
Description
As discovered in MDL-33726, we need to convert hardcoded use of labels:
grep -r "== [\"']label[\"']" *
|
|
|
course/lib.php: if ($info[0] == 'label') { // Labels are ignored in recent activity
|
course/lib.php: if ($mod->modname !== 'label' && $hasmanageactivities && course_ajax_enabled($COURSE)) {
|
lib/modinfolib.php: if ($this->modname === 'label' && $this->content === '') {
|
report/log/locallib.php: if ($mod->mod == "label") {
|
report/log/locallib.php: if ($mod->mod == "label") {
|
Gliffy Diagrams
Issue Links
- blocks
-
MDL-31885
The activity name auto-linking filter should not create links to webpages it was created on.
-
- Closed
-
-
MDL-37455
Allow mod_folder to display the content inline on course page instead of on separate page
-
- Closed
-
- has a non-specific relationship to
-
MDL-33726
In single section mode summary do not list label items
-
- Closed
-
- is duplicated by
-
MDL-37454
Add core support for activities other than labels to display contents inline
-
- Closed
-
Activity
oops, just removed the simpletest things here as not relevant (not regarding mod label)
oh no, there are even more places where label is hardcoded. Reopening
Ok, I corrected almost all hardcoded 'label's that I've found.
I have not used module_supports() rather cm_info::has_view()
We should have better solution for reports but since the logging/reporting API will be redesigned I thought it is unreasonable to implement new callback for reporting purposes now.
There is one know place where I did not remove hardcoded label:
https://github.com/moodle/moodle/blob/master/course/format/renderer.php#L356
because here no other module should be hidden
The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.
TIA and ciao 
Hi Marina,
This is presently causing a couple of unit tests to fail.
Somethings not quite right yet sorry.
Many thanks
Sam
Moving this reopened issue out from current integration. Please, re-submit it for integration once ready.
Moving this reopened issue out from current integration. Please, re-submit it for integration once ready.
YES! After spending several days trying to find what broke the phpunit tests I found it! The filter_manager instance was cached. I have no idea why nobody else experienced those conflicts before and I was so lucky. Anyway, added a commit clearing the cached filter_manager instance
The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.
Thanks!
Thanks Marina - I like removing special cases from the code!
I didn't spot any issues and the unit tests are passing.
I have integrated this to master only (improvement).
It passes, tested in master
Thanks for your hard work - this issue has made it! Moodle is now a little bit better.
Regards, Damyon
I am going to drop everything simpletest related in 2.4dev asap.