mirror of
https://github.com/wekan/wekan.git
synced 2025-09-22 01:50:48 +02:00
[After update wekan to 5.57] Edit profil and change pswd menus are not displayed when SSO authentication is used
This commit is contained in:
parent
5b9a2a8bac
commit
55296b676b
3 changed files with 84 additions and 46 deletions
|
@ -86,58 +86,42 @@ BlazeComponent.extendComponent({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
userHasTeams(){
|
userHasTeams(){
|
||||||
if(Meteor.user().teams)
|
if(Meteor.user().teams && Meteor.user().teams.length > 0)
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
else
|
||||||
else{
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
},
|
},
|
||||||
teamsDatas() {
|
teamsDatas() {
|
||||||
if(Meteor.user().teams)
|
if(Meteor.user().teams)
|
||||||
{
|
|
||||||
return Meteor.user().teams;
|
return Meteor.user().teams;
|
||||||
}
|
else
|
||||||
else{
|
|
||||||
return [];
|
return [];
|
||||||
}
|
|
||||||
},
|
},
|
||||||
userHasOrgs(){
|
userHasOrgs(){
|
||||||
if(Meteor.user().orgs)
|
if(Meteor.user().orgs && Meteor.user().orgs.length > 0)
|
||||||
{
|
|
||||||
return true;
|
return true;
|
||||||
}
|
else
|
||||||
else{
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
},
|
},
|
||||||
orgsDatas() {
|
orgsDatas() {
|
||||||
if(Meteor.user().orgs)
|
if(Meteor.user().orgs)
|
||||||
{
|
|
||||||
return Meteor.user().orgs;
|
return Meteor.user().orgs;
|
||||||
}
|
else
|
||||||
else{
|
|
||||||
return [];
|
return [];
|
||||||
}
|
|
||||||
},
|
},
|
||||||
userHasOrgsOrTeams(){
|
userHasOrgsOrTeams(){
|
||||||
let boolUserHasOrgs;
|
let boolUserHasOrgs;
|
||||||
if(Meteor.user().orgs)
|
if(Meteor.user().orgs && Meteor.user().orgs.length > 0)
|
||||||
{
|
|
||||||
boolUserHasOrgs = true;
|
boolUserHasOrgs = true;
|
||||||
}
|
else
|
||||||
else{
|
|
||||||
boolUserHasOrgs = false;
|
boolUserHasOrgs = false;
|
||||||
}
|
|
||||||
let boolUserHasTeams;
|
let boolUserHasTeams;
|
||||||
if(Meteor.user().teams)
|
if(Meteor.user().teams && Meteor.user().teams.length > 0)
|
||||||
{
|
|
||||||
boolUserHasTeams = true;
|
boolUserHasTeams = true;
|
||||||
}
|
else
|
||||||
else{
|
|
||||||
boolUserHasTeams = false;
|
boolUserHasTeams = false;
|
||||||
}
|
|
||||||
return (boolUserHasOrgs || boolUserHasTeams);
|
return (boolUserHasOrgs || boolUserHasTeams);
|
||||||
},
|
},
|
||||||
boards() {
|
boards() {
|
||||||
|
|
|
@ -31,26 +31,28 @@ template(name='homeSidebar')
|
||||||
+activities(mode="board")
|
+activities(mode="board")
|
||||||
|
|
||||||
template(name="membersWidget")
|
template(name="membersWidget")
|
||||||
.board-widget.board-widget-members
|
if AtLeastOneOrgWasCreated
|
||||||
h3
|
.board-widget.board-widget-members
|
||||||
i.fa.fa-users
|
h3
|
||||||
| {{_ 'organizations'}}
|
i.fa.fa-users
|
||||||
|
| {{_ 'organizations'}}
|
||||||
|
|
||||||
.board-widget-content
|
.board-widget-content
|
||||||
+boardOrgGeneral
|
+boardOrgGeneral
|
||||||
.clearfix
|
.clearfix
|
||||||
br
|
br
|
||||||
hr
|
hr
|
||||||
.board-widget.board-widget-members
|
if AtLeastOneTeamWasCreated
|
||||||
h3
|
.board-widget.board-widget-members
|
||||||
i.fa.fa-users
|
h3
|
||||||
| {{_ 'teams'}}
|
i.fa.fa-users
|
||||||
|
| {{_ 'teams'}}
|
||||||
|
|
||||||
.board-widget-content
|
.board-widget-content
|
||||||
+boardTeamGeneral
|
+boardTeamGeneral
|
||||||
.clearfix
|
.clearfix
|
||||||
br
|
br
|
||||||
hr
|
hr
|
||||||
.board-widget.board-widget-members
|
.board-widget.board-widget-members
|
||||||
h3
|
h3
|
||||||
i.fa.fa-users
|
i.fa.fa-users
|
||||||
|
|
|
@ -183,6 +183,7 @@ Template.memberPopup.helpers({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
Template.boardMenuPopup.events({
|
Template.boardMenuPopup.events({
|
||||||
'click .js-rename-board': Popup.open('boardChangeTitle'),
|
'click .js-rename-board': Popup.open('boardChangeTitle'),
|
||||||
'click .js-open-rules-view'() {
|
'click .js-open-rules-view'() {
|
||||||
|
@ -290,6 +291,42 @@ Template.leaveBoardPopup.helpers({
|
||||||
return Boards.findOne(Session.get('currentBoard'));
|
return Boards.findOne(Session.get('currentBoard'));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
BlazeComponent.extendComponent({
|
||||||
|
onCreated() {
|
||||||
|
this.error = new ReactiveVar('');
|
||||||
|
this.loading = new ReactiveVar(false);
|
||||||
|
this.findOrgsOptions = new ReactiveVar({});
|
||||||
|
this.findTeamsOptions = new ReactiveVar({});
|
||||||
|
|
||||||
|
this.page = new ReactiveVar(1);
|
||||||
|
this.teamPage = new ReactiveVar(1);
|
||||||
|
this.autorun(() => {
|
||||||
|
const limitOrgs = this.page.get() * Number.MAX_SAFE_INTEGER;
|
||||||
|
this.subscribe('org', this.findOrgsOptions.get(), limitOrgs, () => {});
|
||||||
|
});
|
||||||
|
|
||||||
|
this.autorun(() => {
|
||||||
|
const limitTeams = this.teamPage.get() * Number.MAX_SAFE_INTEGER;
|
||||||
|
this.subscribe('team', this.findTeamsOptions.get(), limitTeams, () => {});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
onRendered() {
|
||||||
|
this.setLoading(false);
|
||||||
|
},
|
||||||
|
|
||||||
|
setError(error) {
|
||||||
|
this.error.set(error);
|
||||||
|
},
|
||||||
|
|
||||||
|
setLoading(w) {
|
||||||
|
this.loading.set(w);
|
||||||
|
},
|
||||||
|
|
||||||
|
isLoading() {
|
||||||
|
return this.loading.get();
|
||||||
|
},
|
||||||
|
}).register('membersWidget');
|
||||||
|
|
||||||
Template.membersWidget.helpers({
|
Template.membersWidget.helpers({
|
||||||
isInvited() {
|
isInvited() {
|
||||||
|
@ -307,6 +344,21 @@ Template.membersWidget.helpers({
|
||||||
isBoardAdmin() {
|
isBoardAdmin() {
|
||||||
return Meteor.user().isBoardAdmin();
|
return Meteor.user().isBoardAdmin();
|
||||||
},
|
},
|
||||||
|
AtLeastOneOrgWasCreated(){
|
||||||
|
let orgs = Org.find({}, {sort: { createdAt: -1 }});
|
||||||
|
if(orgs === undefined)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return orgs.count() > 0;
|
||||||
|
},
|
||||||
|
|
||||||
|
AtLeastOneTeamWasCreated(){
|
||||||
|
let teams = Team.find({}, {sort: { createdAt: -1 }});
|
||||||
|
if(teams === undefined)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return teams.count() > 0;
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
Template.membersWidget.events({
|
Template.membersWidget.events({
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue