Cleanup
This commit is contained in:
parent
95fabecc60
commit
8c1be03e5d
2
amd/build/studyplan-editor-components.min.js
vendored
2
amd/build/studyplan-editor-components.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1412,7 +1412,7 @@ export default {
|
|||
}
|
||||
},
|
||||
edit: {
|
||||
'toolbox_shown': false,
|
||||
toolboxShown: false,
|
||||
studyline: {
|
||||
editmode: false,
|
||||
data: {
|
||||
|
@ -1489,22 +1489,22 @@ export default {
|
|||
return;
|
||||
}).catch(notification.exception);
|
||||
} else {
|
||||
self.edit.toolbox_shown = true; // Defaults to on in coching view.
|
||||
self.edit.toolboxShown = true; // Defaults to on in coching view.
|
||||
}
|
||||
this.$root.$emit('redrawLines');
|
||||
this.$emit('pagechanged', this.selectedpage);
|
||||
},
|
||||
beforeUnmount() {
|
||||
this.edit.toolbox_shown = false;
|
||||
this.edit.toolboxShown = false;
|
||||
debug.info("Hiding toolbar because of destroy");
|
||||
},
|
||||
deactivated() {
|
||||
this.edit.toolbox_shown = false;
|
||||
this.edit.toolboxShown = false;
|
||||
debug.info("Hiding toolbar because of deactivation");
|
||||
},
|
||||
activated() {
|
||||
if (this.coaching) {
|
||||
self.edit.toolbox_shown = true; // Defaults to on in coching view.
|
||||
self.edit.toolboxShown = true; // Defaults to on in coching view.
|
||||
}
|
||||
|
||||
},
|
||||
|
@ -1894,7 +1894,7 @@ export default {
|
|||
template:
|
||||
`
|
||||
<div>
|
||||
<t-toolbox v-model="edit.toolbox_shown"
|
||||
<t-toolbox v-model="edit.toolboxShown"
|
||||
:activepage="selectedpage"
|
||||
:coaching="coaching"
|
||||
:studyplanid="value.id"></t-toolbox>
|
||||
|
@ -1902,10 +1902,10 @@ export default {
|
|||
<div class="controlbox-group">
|
||||
<b-form-checkbox v-if="!coaching"
|
||||
v-model="edit.studyline.editmode" class="sw-studyplan-toolbar" switch
|
||||
@change="toolboxSwitched(edit.toolbox_shown && !edit.studyline.editmode); "
|
||||
@change="toolboxSwitched(edit.toolboxShown && !edit.studyline.editmode); "
|
||||
>{{ text.studyline_editmode }}</b-form-checkbox>
|
||||
<b-form-checkbox
|
||||
v-if="!edit.studyline.editmode" v-model="edit.toolbox_shown" class="sw-studyplan-toolbar" switch
|
||||
v-if="!edit.studyline.editmode" v-model="edit.toolboxShown" class="sw-studyplan-toolbar" switch
|
||||
@change="toolboxSwitched"
|
||||
>{{ text.toolbox_toggle}}</b-form-checkbox>
|
||||
<drop
|
||||
|
|
|
@ -210,7 +210,6 @@ class utilityservice extends \external_api {
|
|||
"enablebadges" => !empty($CFG->enablebadges),
|
||||
"badges_allowcoursebadges" => !empty($CFG->badges_allowcoursebadges),
|
||||
"showprevnextarrows" => get_config("local_treestudyplan", "showprevnextarrows"),
|
||||
|
||||
];
|
||||
}
|
||||
|
||||
|
|
13
invited.php
13
invited.php
|
@ -22,13 +22,16 @@
|
|||
*/
|
||||
|
||||
require_once("../../config.php");
|
||||
// Since this page is externally accessed and validated in a different way, no login is needed.
|
||||
// In fact, we need to override the behaviour of require_login to force "guest access" here, even if the configuration says differently.
|
||||
// Note that we do not use set_config(...) here, because we do not want to change the settings in the database.
|
||||
/* Since this page is externally accessed and validated in a different way, no login is needed.
|
||||
In fact, we need to override the behaviour of require_login to force "guest access" here,
|
||||
even if the configuration says differently.
|
||||
Note that we do not use set_config(...) here, because we do not want to change the settings
|
||||
in the database.
|
||||
*/
|
||||
$autologin = $CFG->autologinguests; // Store current guest autologin configuration value.
|
||||
$CFG->autologinguests = 1; // Override guest autologin configuration value.
|
||||
require_login(null,true); // Trigger require_login to make sure we have guest access
|
||||
$CFG->autologinguests = $autologin; // Restore old guest autologin configuration value
|
||||
require_login(null, true); // Trigger require_login to make sure we have guest access.
|
||||
$CFG->autologinguests = $autologin; // Restore old guest autologin configuration value.
|
||||
unset($autologin);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user