Commits

Tim Donohue authored and GitHub committed d71964d440b Merge
Merge pull request #3113 from 4Science/task/main/DURACOM-271_coar-fixes-fixed

COAR Notify impossible to send/receive message from another DSpace
No tags
gidlmaster

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html

Modified
205 205 />
206 206 <div aria-labelledby="inboundItemfilterDropdownButton"
207 207 class="dropdown-menu scrollable-dropdown-menu w-100 "
208 208 ngbDropdownMenu>
209 209 <div class="scrollable-menu" role="listbox">
210 210 <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
211 211 class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
212 212 <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
213 213 </button>
214 214 <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
215 - *ngFor="let constraint of (itemfiltersRD$ | async)?.payload?.page; let internalIndex = index"
215 + *ngFor="let constraint of (itemFiltersRD$ | async)?.payload?.page; let internalIndex = index"
216 216 class="dropdown-item collection-item text-truncate w-100"
217 217 ngbDropdownItem
218 218 type="button">
219 219 <div>{{ constraint.id + '.label' | translate }}</div>
220 220 </button>
221 221 </div>
222 222 </div>
223 223 </div>
224 224 </div>
225 225 </ng-container>
256 256 </button>
257 257 </div>
258 258 </div>
259 259 </div>
260 260 </ng-container>
261 261 </div>
262 262 </div>
263 263
264 264 <span (click)="addInboundPattern()"
265 265 class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
266 + <hr>
267 + <div class="form-group row">
268 + <div class="col text-right space-children-mr">
269 + <ng-content select="[before]"></ng-content>
270 + <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
271 + <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
272 + </button>
273 + <button class="btn btn-primary" type="submit">
274 + <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
275 + </button>
266 276
267 - <div class="submission-form-footer my-1 position-sticky d-flex justify-content-between" role="group">
268 - <button (click)="resetFormAndLeave()" class="btn btn-primary" type="button">
269 - <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
270 - </button>
271 - <button class="btn btn-primary" type="submit">
272 - <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
273 - </button>
277 + </div>
274 278 </div>
275 279 </form>
276 280 </div>
277 281 <ng-template #confirmModal>
278 282 <div class="modal-header">
279 283 <h4 *ngIf="!isNewService">{{'service.overview.edit.modal' | translate }}</h4>
280 284 <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
281 285 <button (click)="closeModal()" aria-label="Close"
282 286 class="close" type="button">
283 287 <span aria-hidden="true">×</span>
287 291 <div class="modal-body">
288 292 <div *ngIf="!isNewService">
289 293 {{ 'service.overview.edit.body' | translate }}
290 294 </div>
291 295 <span *ngIf="isNewService">
292 296 {{ 'service.overview.create.body' | translate }}
293 297 </span>
294 298 </div>
295 299 <div class="modal-footer">
296 300 <div *ngIf="!isNewService">
297 - <button (click)="closeModal()" class="btn btn-danger mr-2"
301 + <button (click)="closeModal()" class="btn btn-outline-secondary mr-2"
298 302 id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
299 303 </button>
300 304 <button *ngIf="!isNewService" (click)="patchService()"
301 305 class="btn btn-primary">{{ 'service.detail.update' | translate }}
302 306 </button>
303 307 </div>
304 308 <div *ngIf="isNewService">
305 - <button (click)="closeModal()" class="btn btn-danger mr-2 "
309 + <button (click)="closeModal()" class="btn btn-outline-secondary mr-2 "
306 310 id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
307 311 </button>
308 312 <button (click)="createService()"
309 313 class="btn btn-primary">{{ 'service.confirm.create' | translate }}
310 314 </button>
311 315 </div>
312 316 </div>
313 317 </ng-template>
314 318
315 319

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

Add shortcut