Skip to content

Commit

Permalink
Merge pull request #1006 from adshares/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
m-pilarczyk authored Feb 21, 2023
2 parents 4a4962b + c421575 commit bb237d2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased
## [Unreleased]

## [2.4.3] - 2023-02-21
### Fixed
Display admin role on screen smaller than 1800px

## [2.4.2] - 2023-02-14
### Changed
Expand Down Expand Up @@ -553,7 +557,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Publisher features (Sites & AdUnits)


[Unreleased]: https://github.com/adshares/adpanel/compare/v2.4.2...develop
[Unreleased]: https://github.com/adshares/adpanel/compare/v2.4.3...develop
[2.4.3]: https://github.com/adshares/adpanel/compare/v2.4.2...v2.4.3
[2.4.2]: https://github.com/adshares/adpanel/compare/v2.4.1...v2.4.2
[2.4.1]: https://github.com/adshares/adpanel/compare/v2.4.0...v2.4.1
[2.4.0]: https://github.com/adshares/adpanel/compare/v2.3.0...v2.4.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adpanel",
"version": "2.4.2",
"version": "2.4.3",
"scripts": {
"ng": "ng",
"start": "ng serve adshares",
Expand Down
7 changes: 4 additions & 3 deletions src/app/common/components/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
[ngClass]="{ active: activeUserType === userType }"
(click)="setActiveUserType(userType)">
<fa-icon class="ap-icon ap-icon--prepend" [icon]="faUser"></fa-icon>
<span *ngIf="session.isModerator()">Moderator</span>
<span *ngIf="session.isModerator() && !session.isAdmin()">Moderator</span>
<span *ngIf="session.isAdmin()">Admin</span>
<span *ngIf="session.isAgency()">Agency</span>
</button>
</div>
<div
*ngIf="!session.isModerator() || session.isImpersonated()"
class="ap-btn ap-btn--text ap-btn-light row align-center help-menu no-underline hidden-xl-up"
(mouseover)="toggleRolesMenu(true)"
(mouseleave)="toggleRolesMenu(false)">
Expand Down Expand Up @@ -88,7 +88,8 @@
[ngClass]="{ active: activeUserType === userType }"
(click)="setActiveUserType(userType)">
<fa-icon class="ap-icon ap-icon--prepend" [icon]="faUser"></fa-icon>
<span *ngIf="session.isModerator()">Moderator</span>
<span *ngIf="session.isModerator() && !session.isAdmin()">Moderator</span>
<span *ngIf="session.isAdmin()">Admin</span>
<span *ngIf="session.isAgency()">Agency</span>
</button>
</li>
Expand Down

0 comments on commit bb237d2

Please sign in to comment.