Fix: Variable & array with the name “user” changed to “users”
This commit is contained in:
parent
9cd1090583
commit
32b4d18ffe
6 changed files with 20 additions and 22 deletions
|
|
@ -155,11 +155,10 @@
|
||||||
dBlock: openUserWindowBoolean,
|
dBlock: openUserWindowBoolean,
|
||||||
dNone: !openUserWindowBoolean
|
dNone: !openUserWindowBoolean
|
||||||
}"
|
}"
|
||||||
[user]="user"
|
[users]="users"
|
||||||
[openUserWindowBoolean]="openUserWindowBoolean"
|
[openUserWindowBoolean]="openUserWindowBoolean"
|
||||||
(closeUserWindow)="changeOpenUserWindowBoolean($event)"
|
(closeUserWindow)="changeOpenUserWindowBoolean($event)"
|
||||||
></app-open-send-prv-message-window>
|
></app-open-send-prv-message-window>
|
||||||
@if (!publicChannelsList.includes(currentChannel)) {
|
|
||||||
<div class="leaveChannel">
|
<div class="leaveChannel">
|
||||||
<button
|
<button
|
||||||
[disabled]="openEditNameInput || openEditNameDescription"
|
[disabled]="openEditNameInput || openEditNameDescription"
|
||||||
|
|
@ -168,7 +167,6 @@
|
||||||
{{ "channel-information.leave" | translate }}
|
{{ "channel-information.leave" | translate }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ export class ChannelInformationComponent {
|
||||||
descriptionValue: string = '';
|
descriptionValue: string = '';
|
||||||
getCurrentChannel: Channel[] = [];
|
getCurrentChannel: Channel[] = [];
|
||||||
openUserWindowBoolean: boolean = false;
|
openUserWindowBoolean: boolean = false;
|
||||||
user: User[] = [];
|
users: User[] = [];
|
||||||
publicChannelsList: string[] = [];
|
publicChannelsList: string[] = [];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|
@ -145,7 +145,7 @@ export class ChannelInformationComponent {
|
||||||
* @param {User} user - The user to display information about.
|
* @param {User} user - The user to display information about.
|
||||||
*/
|
*/
|
||||||
openUserWindow(user: User) {
|
openUserWindow(user: User) {
|
||||||
this.user = [user];
|
this.users = [user];
|
||||||
this.openUserWindowBoolean = !this.openUserWindowBoolean;
|
this.openUserWindowBoolean = !this.openUserWindowBoolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<div class="darkBackground" (click)="closeWindow()"></div>
|
<div class="darkBackground" (click)="closeWindow()"></div>
|
||||||
@if (showProfil) {
|
@if (showProfil) {
|
||||||
<!----- show prvProfil ----->
|
<!----- show prvProfil ----->
|
||||||
@for(i of talkToUser; track i){
|
@for(user of talkToUser; track user){
|
||||||
<div class="whiteBox">
|
<div class="whiteBox">
|
||||||
<div class="boxHeader">
|
<div class="boxHeader">
|
||||||
<p>{{ "open-send-prv-message.profil" | translate }}</p>
|
<p>{{ "open-send-prv-message.profil" | translate }}</p>
|
||||||
|
|
@ -10,20 +10,20 @@
|
||||||
<img src="./assets/img/closeIcon.svg" class="closeIcon" />
|
<img src="./assets/img/closeIcon.svg" class="closeIcon" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<img src="{{ i.avatar }}" class="profileImg" />
|
<img src="{{ user.avatar }}" class="profileImg" />
|
||||||
<div class="detailsBox">
|
<div class="detailsBox">
|
||||||
<div class="editBtnPosition">
|
<div class="editBtnPosition">
|
||||||
<p class="name">{{ i.firstName }} {{ i.lastName }}</p>
|
<p class="name">{{ user.firstName }} {{ user.lastName }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="statusBox">
|
<div class="statusBox">
|
||||||
<img
|
<img
|
||||||
src="./assets/img/{{
|
src="./assets/img/{{
|
||||||
i.status ? 'onlineRing.svg' : 'offlineRing.svg'
|
user.status ? 'onlineRing.svg' : 'offlineRing.svg'
|
||||||
}}"
|
}}"
|
||||||
class="onlineIcon"
|
class="onlineIcon"
|
||||||
/>
|
/>
|
||||||
@if (i.status) {
|
@if (user.status) {
|
||||||
<p class="fontColorGreen">
|
<p class="fontColorGreen">
|
||||||
{{ "open-send-prv-message.aktiv" | translate }}
|
{{ "open-send-prv-message.aktiv" | translate }}
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
<div class="email">
|
<div class="email">
|
||||||
<p>{{ "open-send-prv-message.address" | translate }}</p>
|
<p>{{ "open-send-prv-message.address" | translate }}</p>
|
||||||
<a href="mailto:wwweewefeff@dede.de" target="_blank">{{
|
<a href="mailto:wwweewefeff@dede.de" target="_blank">{{
|
||||||
i.email
|
user.email
|
||||||
}}</a>
|
}}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
</div>
|
</div>
|
||||||
} } @else {
|
} } @else {
|
||||||
<!----- show channelMember ----->
|
<!----- show channelMember ----->
|
||||||
@for(i of user; track i){
|
@for(user of users; track user){
|
||||||
<div class="whiteBox">
|
<div class="whiteBox">
|
||||||
<div class="boxHeader">
|
<div class="boxHeader">
|
||||||
<p>{{ "open-send-prv-message.profil" | translate }}</p>
|
<p>{{ "open-send-prv-message.profil" | translate }}</p>
|
||||||
|
|
@ -53,20 +53,20 @@
|
||||||
<img src="./assets/img/closeIcon.svg" class="closeIcon" />
|
<img src="./assets/img/closeIcon.svg" class="closeIcon" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<img src="{{ i.avatar }}" class="profileImg" />
|
<img src="{{ user.avatar }}" class="profileImg" />
|
||||||
<div class="detailsBox">
|
<div class="detailsBox">
|
||||||
<div class="editBtnPosition">
|
<div class="editBtnPosition">
|
||||||
<p class="name">{{ i.firstName }} {{ i.lastName }}</p>
|
<p class="name">{{ user.firstName }} {{ user.lastName }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="statusBox">
|
<div class="statusBox">
|
||||||
<img
|
<img
|
||||||
src="./assets/img/{{
|
src="./assets/img/{{
|
||||||
i.status ? 'onlineRing.svg' : 'offlineRing.svg'
|
user.status ? 'onlineRing.svg' : 'offlineRing.svg'
|
||||||
}}"
|
}}"
|
||||||
class="onlineIcon"
|
class="onlineIcon"
|
||||||
/>
|
/>
|
||||||
@if (i.status) {
|
@if (user.status) {
|
||||||
<p class="fontColorGreen">
|
<p class="fontColorGreen">
|
||||||
{{ "open-send-prv-message.aktiv" | translate }}
|
{{ "open-send-prv-message.aktiv" | translate }}
|
||||||
</p>
|
</p>
|
||||||
|
|
@ -79,11 +79,11 @@
|
||||||
<img src="./assets/img/mail-icon.svg" />
|
<img src="./assets/img/mail-icon.svg" />
|
||||||
<div class="email">
|
<div class="email">
|
||||||
<p>E-Mail-Address</p>
|
<p>E-Mail-Address</p>
|
||||||
<a href="mailto:{{ i.email }}" target="_blank">{{ i.email }}</a>
|
<a href="mailto:{{ user.email }}" target="_blank">{{ user.email }}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button (click)="routeToUser(user)">
|
<button (click)="routeToUser(users)">
|
||||||
<img src="./assets/img/messageIcon.svg" />
|
<img src="./assets/img/messageIcon.svg" />
|
||||||
{{ "open-send-prv-message.message" | translate }}
|
{{ "open-send-prv-message.message" | translate }}
|
||||||
</button>
|
</button>
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||||
styleUrl: './open-send-prv-message-window.component.scss',
|
styleUrl: './open-send-prv-message-window.component.scss',
|
||||||
})
|
})
|
||||||
export class OpenSendPrvMessageWindowComponent {
|
export class OpenSendPrvMessageWindowComponent {
|
||||||
@Input() user: User[] = [];
|
@Input() users: User[] = [];
|
||||||
@Input() talkToUser: User[] = [];
|
@Input() talkToUser: User[] = [];
|
||||||
@Input() openUserWindowBoolean: boolean = false;
|
@Input() openUserWindowBoolean: boolean = false;
|
||||||
@Input() showProfil: boolean = false;
|
@Input() showProfil: boolean = false;
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@
|
||||||
</section>
|
</section>
|
||||||
<app-open-send-prv-message-window
|
<app-open-send-prv-message-window
|
||||||
[ngClass]="{ dBlock: openUserWindowBoolean, dNone: !openUserWindowBoolean }"
|
[ngClass]="{ dBlock: openUserWindowBoolean, dNone: !openUserWindowBoolean }"
|
||||||
[user]="user"
|
[users]="users"
|
||||||
[openUserWindowBoolean]="openUserWindowBoolean"
|
[openUserWindowBoolean]="openUserWindowBoolean"
|
||||||
(closeUserWindow)="changeOpenUserWindowBoolean($event)"
|
(closeUserWindow)="changeOpenUserWindowBoolean($event)"
|
||||||
></app-open-send-prv-message-window>
|
></app-open-send-prv-message-window>
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ export class ShowChannelMemberComponent {
|
||||||
getSelectedUsers: User[] = [];
|
getSelectedUsers: User[] = [];
|
||||||
selectedUsers: string[] = [];
|
selectedUsers: string[] = [];
|
||||||
openUserWindowBoolean: boolean = false;
|
openUserWindowBoolean: boolean = false;
|
||||||
user: User[] = [];
|
users: User[] = [];
|
||||||
|
|
||||||
@Input() getFiltertUsers!: User[];
|
@Input() getFiltertUsers!: User[];
|
||||||
@Input() currentChannel!: string;
|
@Input() currentChannel!: string;
|
||||||
|
|
@ -166,7 +166,7 @@ export class ShowChannelMemberComponent {
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
openUserWindow(user: User) {
|
openUserWindow(user: User) {
|
||||||
this.user = [user];
|
this.users = [user];
|
||||||
this.openUserWindowBoolean = !this.openUserWindowBoolean;
|
this.openUserWindowBoolean = !this.openUserWindowBoolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue