remove sql restriction for promotion get
parent
9ab53c96e8
commit
a916a5e707
|
@ -58,7 +58,8 @@ request.route('/award')
|
|||
|
||||
request.route('/promotion')
|
||||
|
||||
.get(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
|
||||
.get((req, res, next) => {
|
||||
// TODO: add SQL authetnication
|
||||
const squadFilter = req.query.squadId;
|
||||
const fractFilter = req.query.fractFilter;
|
||||
const progressFilter = req.query.inProgress;
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
</li>
|
||||
<li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
|
||||
<a href="#"
|
||||
[ngClass]="{'unprocessed': loginService.hasPermission(2) && loginService.hasSquad() && (promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards)}"
|
||||
[ngClass]="{'unprocessed': promotionService.hasUnprocessedPromotion || awardingService.hasUnprocessedAwards}"
|
||||
class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
Anträge
|
||||
|
@ -62,11 +62,11 @@
|
|||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a [ngClass]="{'unprocessed-child': loginService.hasPermission(2) && loginService.hasSquad() && promotionService.hasUnprocessedPromotion}"
|
||||
<a [ngClass]="{'unprocessed-child': promotionService.hasUnprocessedPromotion}"
|
||||
routerLink="{{config.request}}/{{config.confirmPromotionPath}}">Beförderung</a>
|
||||
</li>
|
||||
<li>
|
||||
<a [ngClass]="{'unprocessed-child': loginService.hasPermission(2) && loginService.hasSquad() && awardingService.hasUnprocessedAwards}"
|
||||
<a [ngClass]="{'unprocessed-child': && awardingService.hasUnprocessedAwards}"
|
||||
routerLink="{{config.request}}/{{config.confirmAwardPath}}">Orden/ Auszeichnung</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
Loading…
Reference in New Issue