MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-06-26 14:00:50 +03:00
parent 2b418482bb efcb6aba26
commit 6f34132dbc
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/web/src/main/java/org/opencdmp/controllers/EntityDoiController.java
View File

@ -24,6 +24,7 @@ import org.opencdmp.controllers.swagger.SwaggerHelpers;
import org.opencdmp.controllers.swagger.annotation.OperationWithTenantHeader; import org.opencdmp.controllers.swagger.annotation.OperationWithTenantHeader;
import org.opencdmp.controllers.swagger.annotation.Swagger400; import org.opencdmp.controllers.swagger.annotation.Swagger400;
import org.opencdmp.controllers.swagger.annotation.Swagger404; import org.opencdmp.controllers.swagger.annotation.Swagger404;
import org.opencdmp.controllers.swagger.annotation.SwaggerCommonErrorResponses;
import org.opencdmp.data.EntityDoiEntity; import org.opencdmp.data.EntityDoiEntity;
import org.opencdmp.model.DescriptionTemplateType; import org.opencdmp.model.DescriptionTemplateType;
import org.opencdmp.model.EntityDoi; import org.opencdmp.model.EntityDoi;
@ -47,6 +48,7 @@ import java.util.*;
@RestController @RestController
@RequestMapping(path = "api/entity-doi") @RequestMapping(path = "api/entity-doi")
@Tag(name = "Entity DOIs", description = "Manage entity dois") @Tag(name = "Entity DOIs", description = "Manage entity dois")
@SwaggerCommonErrorResponses
public class EntityDoiController { public class EntityDoiController {
private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(EntityDoiController.class)); private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(EntityDoiController.class));

4
dmp-frontend/src/app/ui/description/overview/description-overview.component.html
View File

@ -1,6 +1,6 @@
<div class="main-content pl-5 pr-5"> <div class="main-content pl-5 pr-5">
<div class="container-fluid pl-0 pr-0"> <div class="container-fluid pl-0 pr-0">
<div *ngIf="description && userName"> <div *ngIf="description">
<div class="row"> <div class="row">
<div class="col-12 pl-2 mb-3"> <div class="col-12 pl-2 mb-3">
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -201,7 +201,7 @@
<p class="authors-label">{{ dmpUser.user?.name }}</p> <p class="authors-label">{{ dmpUser.user?.name }}</p>
</ng-container> </ng-container>
<ng-template #you> <ng-template #you>
<p class="authors-label">{{ userName }} <p *ngIf="userName" class="authors-label">{{ userName }}
<span>({{ 'DESCRIPTION-OVERVIEW.YOU' | translate }})</span> <span>({{ 'DESCRIPTION-OVERVIEW.YOU' | translate }})</span>
</p> </p>
</ng-template> </ng-template>

4
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
View File

@ -1,6 +1,6 @@
<div class="main-content dmp-overview pl-5 pr-5"> <div class="main-content dmp-overview pl-5 pr-5">
<div class="container-fluid pl-0 pr-0"> <div class="container-fluid pl-0 pr-0">
<div *ngIf="dmp && userName"> <div *ngIf="dmp">
<div class="row"> <div class="row">
<div class="col-12 pl-2 mb-3"> <div class="col-12 pl-2 mb-3">
<app-navigation-breadcrumb /> <app-navigation-breadcrumb />
@ -256,7 +256,7 @@
<p class="authors-label">{{ dmpUser.user?.name }}</p> <p class="authors-label">{{ dmpUser.user?.name }}</p>
</ng-container> </ng-container>
<ng-template #you> <ng-template #you>
<p class="authors-label"> {{ userName }} <p *ngIf="userName" class="authors-label"> {{ userName }}
<span > <span >
({{ 'DMP-OVERVIEW.YOU' | translate }})</span> ({{ 'DMP-OVERVIEW.YOU' | translate }})</span>
</p> </p>