Commit 541272b3 authored by Nelson DINIS GONÇALVES's avatar Nelson DINIS GONÇALVES
Browse files

Merge branch 'develop' of forge.grandlyon.com:laclasse/etherpad

parents 7ce5ce8b 79b81cd5
......@@ -9,7 +9,6 @@ RUN /app/bin/installDeps.sh
COPY ./settings.json.tmpl /app/settings.json.tmpl
COPY ./docker-entrypoint.sh /docker-entrypoint.sh
COPY ./nginx/default.conf.tmpl /etc/nginx/conf.d/default.conf.tmpl
COPY ./pad.js /app/src/static/custom/pad.js
COPY ./ep_laclasse/ /app/node_modules/ep_laclasse/
COPY ./ep_disable_change_author_name/ /app/node_modules/ep_disable_change_author_name/
EXPOSE 80
......
......@@ -103,7 +103,6 @@ exports.authorize = async function (hook_name, context, cb) {
try {
let rights = await padRightsForUser(padID, user.username);
laclasseLogger.info(`padRightsForUser rights: ${rights}`);
if(rights === false || rights.Read == false) {
return cb([]);
......@@ -192,8 +191,6 @@ async function padRightsForUser(id, userId) {
}
exports.authenticate = async function (hook_name, context, cb) {
laclasseLogger.info('authenticate');
laclasseLogger.info('authenticate: current session: ', context.req.session);
// if no session available, authentication fails
......
......@@ -11,6 +11,9 @@
"authorize": "ep_laclasse/authenticate.js",
"authnFailure": "ep_laclasse/authenticate.js",
"authzFailure": "ep_laclasse/authenticate.js"
},
"client_hooks": {
"documentReady": "ep_laclasse/static/js/loadDNMA"
}
}
]
......
function customStart()
{
'use strict';
exports.documentReady = () => {
//define your javascript here
//jquery is available - except index.js
//you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
$.getScript('/api/dnma/js?resource_url=%2Fpads%2F');
}
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment