Commits

Tim Donohue authored and GitHub committed 739af16f41f Merge
Merge pull request #3030 from 4Science/task/main/DURACOM-258

Allow submitter users to accept/ignore suggestions
No tags
gidlmaster

src/app/notifications/qa/events/quality-assurance-events.component.html

Modified
149 149 [disabled]="eventElement.isRunning"
150 150 (click)="removeProject(eventElement)"
151 151 [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
152 152 >
153 153 <i class="fas fa-trash-alt"></i>
154 154 </button>
155 155 </div>
156 156 </div>
157 157 </td>
158 158 <td>
159 - <div *ngIf="(isAdmin$ | async)" class="btn-group button-width">
159 + <div *ngIf="(isAdmin$ | async) || !isReinstateWithdrawnRequest" class="btn-group button-width">
160 160 <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
161 161 class="btn btn-outline-success btn-sm button-width"
162 162 ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
163 163 container="body"
164 164 [disabled]="eventElement.isRunning"
165 165 (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
166 166 [attr.aria-label]="'quality-assurance.event.action.import' | translate"
167 167 >
168 168 <i class="fas fa-check"></i>
169 169 </button>
180 180 <button class="btn btn-outline-dark btn-sm button-width"
181 181 ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
182 182 container="body"
183 183 [disabled]="eventElement.isRunning"
184 184 (click)="openModal('DISCARDED', eventElement, ignoreModal)"
185 185 [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
186 186 >
187 187 <i class="fas fa-ban"></i>
188 188 </button>
189 189 <button class="btn btn-outline-danger btn-sm button-width"
190 + *ngIf="(isAdmin$ | async)"
190 191 ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
191 192 container="body"
192 193 [disabled]="eventElement.isRunning"
193 194 (click)="openModal('REJECTED', eventElement, rejectModal)"
194 195 [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
195 196 >
196 197 <i class="fas fa-trash-alt"></i>
197 198 </button>
199 + <button class="btn btn-outline-danger btn-sm button-width"
200 + *ngIf="(isAdmin$ | async) === false"
201 + ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
202 + container="body"
203 + [disabled]="eventElement.isRunning"
204 + [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
205 + (click)="openModal('UNDO', eventElement, undoModal)">
206 + <i class="fas fa-trash-alt"></i>
207 + </button>
198 208 </div>
199 - <div *ngIf="(isAdmin$ | async) !== true" class="btn-group button-width">
209 + <div *ngIf="(isAdmin$ | async) !== true && isReinstateWithdrawnRequest" class="btn-group button-width">
200 210 <button class="btn btn-outline-danger btn-sm button-width"
201 211 ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
202 212 container="body"
203 213 [disabled]="eventElement.isRunning"
204 214 [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
205 215 (click)="openModal('UNDO', eventElement, undoModal)">
206 216 <i class="fas fa-trash-alt"></i>
207 217 </button>
208 218 </div>
209 219 </td>

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut