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: {
|
edit: {
|
||||||
'toolbox_shown': false,
|
toolboxShown: false,
|
||||||
studyline: {
|
studyline: {
|
||||||
editmode: false,
|
editmode: false,
|
||||||
data: {
|
data: {
|
||||||
|
@ -1489,22 +1489,22 @@ export default {
|
||||||
return;
|
return;
|
||||||
}).catch(notification.exception);
|
}).catch(notification.exception);
|
||||||
} else {
|
} 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.$root.$emit('redrawLines');
|
||||||
this.$emit('pagechanged', this.selectedpage);
|
this.$emit('pagechanged', this.selectedpage);
|
||||||
},
|
},
|
||||||
beforeUnmount() {
|
beforeUnmount() {
|
||||||
this.edit.toolbox_shown = false;
|
this.edit.toolboxShown = false;
|
||||||
debug.info("Hiding toolbar because of destroy");
|
debug.info("Hiding toolbar because of destroy");
|
||||||
},
|
},
|
||||||
deactivated() {
|
deactivated() {
|
||||||
this.edit.toolbox_shown = false;
|
this.edit.toolboxShown = false;
|
||||||
debug.info("Hiding toolbar because of deactivation");
|
debug.info("Hiding toolbar because of deactivation");
|
||||||
},
|
},
|
||||||
activated() {
|
activated() {
|
||||||
if (this.coaching) {
|
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:
|
template:
|
||||||
`
|
`
|
||||||
<div>
|
<div>
|
||||||
<t-toolbox v-model="edit.toolbox_shown"
|
<t-toolbox v-model="edit.toolboxShown"
|
||||||
:activepage="selectedpage"
|
:activepage="selectedpage"
|
||||||
:coaching="coaching"
|
:coaching="coaching"
|
||||||
:studyplanid="value.id"></t-toolbox>
|
:studyplanid="value.id"></t-toolbox>
|
||||||
|
@ -1902,10 +1902,10 @@ export default {
|
||||||
<div class="controlbox-group">
|
<div class="controlbox-group">
|
||||||
<b-form-checkbox v-if="!coaching"
|
<b-form-checkbox v-if="!coaching"
|
||||||
v-model="edit.studyline.editmode" class="sw-studyplan-toolbar" switch
|
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>
|
>{{ text.studyline_editmode }}</b-form-checkbox>
|
||||||
<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"
|
@change="toolboxSwitched"
|
||||||
>{{ text.toolbox_toggle}}</b-form-checkbox>
|
>{{ text.toolbox_toggle}}</b-form-checkbox>
|
||||||
<drop
|
<drop
|
||||||
|
@ -4544,7 +4544,7 @@ export default {
|
||||||
'studyplan_id': self.studyplanid,
|
'studyplan_id': self.studyplanid,
|
||||||
}
|
}
|
||||||
}])[0].then((response) => {
|
}])[0].then((response) => {
|
||||||
debug.info("Toolbox got courses and categories",response);
|
debug.info("Toolbox got courses and categories", response);
|
||||||
self.courses = response;
|
self.courses = response;
|
||||||
self.loadingcourses = false;
|
self.loadingcourses = false;
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -210,7 +210,6 @@ class utilityservice extends \external_api {
|
||||||
"enablebadges" => !empty($CFG->enablebadges),
|
"enablebadges" => !empty($CFG->enablebadges),
|
||||||
"badges_allowcoursebadges" => !empty($CFG->badges_allowcoursebadges),
|
"badges_allowcoursebadges" => !empty($CFG->badges_allowcoursebadges),
|
||||||
"showprevnextarrows" => get_config("local_treestudyplan", "showprevnextarrows"),
|
"showprevnextarrows" => get_config("local_treestudyplan", "showprevnextarrows"),
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
13
invited.php
13
invited.php
|
@ -22,13 +22,16 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once("../../config.php");
|
require_once("../../config.php");
|
||||||
// Since this page is externally accessed and validated in a different way, no login is needed.
|
/* 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.
|
In fact, we need to override the behaviour of require_login to force "guest access" here,
|
||||||
// Note that we do not use set_config(...) here, because we do not want to change the settings in the database.
|
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.
|
$autologin = $CFG->autologinguests; // Store current guest autologin configuration value.
|
||||||
$CFG->autologinguests = 1; // Override 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
|
require_login(null, true); // Trigger require_login to make sure we have guest access.
|
||||||
$CFG->autologinguests = $autologin; // Restore old guest autologin configuration value
|
$CFG->autologinguests = $autologin; // Restore old guest autologin configuration value.
|
||||||
unset($autologin);
|
unset($autologin);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
background-color: var(--light);
|
background-color: var(--light);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
--p-sidebar-hideoffset: -320px;
|
--p-sidebar-hideoffset: -320px;
|
||||||
//overflow-y: auto;
|
//overflow-y: auto;
|
||||||
|
@ -54,7 +54,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.p-easeinout-enter {
|
.p-easeinout-enter {
|
||||||
display:flex;
|
display: flex;
|
||||||
&:not(.p-sidebar-right) {
|
&:not(.p-sidebar-right) {
|
||||||
margin-left: var(--p-sidebar-hideoffset);
|
margin-left: var(--p-sidebar-hideoffset);
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,7 +240,7 @@ if ($hassiteconfig) {
|
||||||
get_string('setting_competency_heading', 'local_treestudyplan'),
|
get_string('setting_competency_heading', 'local_treestudyplan'),
|
||||||
get_string('settingdesc_competency_heading', 'local_treestudyplan')
|
get_string('settingdesc_competency_heading', 'local_treestudyplan')
|
||||||
));
|
));
|
||||||
|
|
||||||
$page->add(new admin_setting_configtext('local_treestudyplan/competency_thresh_completed',
|
$page->add(new admin_setting_configtext('local_treestudyplan/competency_thresh_completed',
|
||||||
get_string('setting_competency_thresh_completed', 'local_treestudyplan'),
|
get_string('setting_competency_thresh_completed', 'local_treestudyplan'),
|
||||||
get_string('settingdesc_competency_thresh_completed', 'local_treestudyplan'),
|
get_string('settingdesc_competency_thresh_completed', 'local_treestudyplan'),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user