Skip to content

Commit

Permalink
Fix forum attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
tituspijean committed Jun 5, 2021
1 parent a4d66bc commit d519f6c
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 37 deletions.
4 changes: 2 additions & 2 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
->post('/auth/ldap', 'auth.ldap.post', Controllers\LDAPAuthController::class)
->get('/auth/ldap', 'auth.ldap.get', Controllers\LDAPAuthController::class),
(new Extend\Settings)
->serializeToForum('onlyUseLDAP', 'tituspijean-auth-ldap.onlyUse')
->serializeToForum('LDAP_method_name', 'tituspijean-auth-ldap.method_name'),
->serializeToForum('tituspijean-auth-ldap.onlyUse', 'tituspijean-auth-ldap.onlyUse', 'boolVal', false)
->serializeToForum('tituspijean-auth-ldap.method_name', 'tituspijean-auth-ldap.method_name', 'strVal', 'LDAP'),
];
2 changes: 1 addition & 1 deletion js/dist/admin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/dist/admin.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/dist/forum.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/dist/forum.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/src/admin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ app.initializers.add('tituspijean-auth-ldap', function(app) {
setting: settingsPrefix + 'onlyUse',
label: app.translator.trans(translationPrefix + 'onlyUse'),
type: 'boolean',
placeholder: false,
default: false,
}
)
});
12 changes: 6 additions & 6 deletions js/src/forum/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { extend, override } from 'flarum/extend';
import app from 'flarum/app';
import { extend, override } from 'flarum/common/extend';
import app from 'flarum/common/app';

import HeaderSecondary from "flarum/components/HeaderSecondary";
import SettingsPage from "flarum/components/SettingsPage";
Expand All @@ -10,7 +10,7 @@ import LDAPLogInModal from "./components/LDAPLogInModal";

const translationPrefix = 'tituspijean-auth-ldap.forum.';

app.initializers.add('tituspijean-auth-ldap', function() {
app.initializers.add('tituspijean-auth-ldap', () => {

extend(HeaderSecondary.prototype, 'items', addLoginLink);
extend(HeaderSecondary.prototype, 'items', removeIfOnlyUse);
Expand All @@ -20,7 +20,7 @@ app.initializers.add('tituspijean-auth-ldap', function() {
extend(SettingsPage.prototype, 'settingsItems', checkRemoveAccountSection);

function overrideModal() {
if (app.forum.attribute('onlyUseLDAP')) {
if (app.forum.attribute('tituspijean-auth-ldap.onlyUse')) {
LogInModal.prototype.content = LDAPLogInModal.prototype.content
LogInModal.prototype.title = LDAPLogInModal.prototype.title
LogInModal.prototype.body = LDAPLogInModal.prototype.body
Expand All @@ -38,15 +38,15 @@ app.initializers.add('tituspijean-auth-ldap', function() {
className: 'Button Button--link',
onclick: () => app.modal.show(LDAPLogInModal)
},
app.translator.trans(translationPrefix + 'log_in_with', {server: app.forum.attribute('LDAP_method_name')})
app.translator.trans(translationPrefix + 'log_in_with', {server: app.forum.attribute('tituspijean-auth-ldap.method_name')})
),
0
);
}
}

function removeIfOnlyUse(items) {
if (app.forum.attribute('onlyUseLDAP')) {
if (app.forum.attribute('tituspijean-auth-ldap.onlyUse')) {
if (items.has('signUp')) {
items.remove('signUp');
}
Expand Down
Loading

0 comments on commit d519f6c

Please sign in to comment.