Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 1.0-maintenance
  • 1.1-maintenance
  • 2.0-maintenance
  • 2.1-maintenance
  • adf-1032-keytitle-at-issn-service
  • adf-1212-add-forgotten-publications-to-validate-into-profile
  • adf-1259-abstract-not-mandatory-for-thesis
  • adf-1393-manage-old-thesis
  • adf-1542-disable-button-to-update-publication-in-access
  • adf-1603-remove-guide-link-from-menu
  • adf-237-structures-user-icons-in-profile
  • adf-956-new-document-types
  • adf-956-new-file-type-imprimatur-and-mode-de-diffusion-for-thesis
  • aou-1542_add_button_access_bibliography_generator
  • aou-1617_create_warning_when_contributor_are_identical
  • aou-1638_change_radio_to_checkbox
  • fpo/1040_do_not_show_multiple_action_buttons_when_only_one_deposit_is_selected
  • fpo/263_flatten_the_json_format_used_by_the_frontend
  • fpo/avoid_infinite_login_loop
  • fpo/components_in_solidify
  • fpo/dark_mode_refactor
  • hbo-test
  • hbo_fix_dont_run_twice_http_request_autocomplete
  • jbc-new-icons
  • master
  • rodn-1767-access-level-images
  • rodn-1829-scheduled-task-to-export-to-orcid
  • rodn-admin-user-business-roles
  • rodn-labels-refactoring
  • rodn-logout-refactoring
  • rodn-rename-form-data
  • aou-0.0.1
  • aou-0.0.2
  • aou-0.0.3
  • aou-0.0.4
  • aou-0.0.5
  • aou-1.0.0
  • aou-1.0.1
  • aou-1.0.2
  • aou-1.0.3
  • aou-1.0.4
  • aou-1.0.5
  • aou-1.0.6
  • aou-1.1.0
  • aou-1.1.1
  • aou-1.1.2
  • aou-1.2.0-RC1
  • aou-1.2.0-RC2
  • aou-1.2.0-RC3
  • aou-1.2.0-alpha1
  • aou-2.0.0
  • aou-2.0.1
  • aou-2.0.2
  • aou-2.0.3
  • aou-2.0.4
  • aou-2.0.5
  • aou-2.0.6
  • aou-2.0.7
  • aou-2.1.0
  • aou-2.1.1
  • aou-2.1.2
  • aou-2.1.3
  • aou-2.1.4
  • aou-2.1.5
  • aou-2.1.6
  • aou-2.1.7
  • aou-2.2.0
  • aou-2.2.1
68 results

Target

Select target project
  • aou/aou-portal
1 result
Select Git revision
  • 1.0-maintenance
  • 1.1-maintenance
  • 2.0-maintenance
  • 2.1-maintenance
  • adf-1032-keytitle-at-issn-service
  • adf-1212-add-forgotten-publications-to-validate-into-profile
  • adf-1259-abstract-not-mandatory-for-thesis
  • adf-1393-manage-old-thesis
  • adf-1542-disable-button-to-update-publication-in-access
  • adf-1603-remove-guide-link-from-menu
  • adf-237-structures-user-icons-in-profile
  • adf-956-new-document-types
  • adf-956-new-file-type-imprimatur-and-mode-de-diffusion-for-thesis
  • aou-1542_add_button_access_bibliography_generator
  • aou-1617_create_warning_when_contributor_are_identical
  • aou-1638_change_radio_to_checkbox
  • fpo/1040_do_not_show_multiple_action_buttons_when_only_one_deposit_is_selected
  • fpo/263_flatten_the_json_format_used_by_the_frontend
  • fpo/avoid_infinite_login_loop
  • fpo/components_in_solidify
  • fpo/dark_mode_refactor
  • hbo-test
  • hbo_fix_dont_run_twice_http_request_autocomplete
  • jbc-new-icons
  • master
  • rodn-1767-access-level-images
  • rodn-1829-scheduled-task-to-export-to-orcid
  • rodn-admin-user-business-roles
  • rodn-labels-refactoring
  • rodn-logout-refactoring
  • rodn-rename-form-data
  • aou-0.0.1
  • aou-0.0.2
  • aou-0.0.3
  • aou-0.0.4
  • aou-0.0.5
  • aou-1.0.0
  • aou-1.0.1
  • aou-1.0.2
  • aou-1.0.3
  • aou-1.0.4
  • aou-1.0.5
  • aou-1.0.6
  • aou-1.1.0
  • aou-1.1.1
  • aou-1.1.2
  • aou-1.2.0-RC1
  • aou-1.2.0-RC2
  • aou-1.2.0-RC3
  • aou-1.2.0-alpha1
  • aou-2.0.0
  • aou-2.0.1
  • aou-2.0.2
  • aou-2.0.3
  • aou-2.0.4
  • aou-2.0.5
  • aou-2.0.6
  • aou-2.0.7
  • aou-2.1.0
  • aou-2.1.1
  • aou-2.1.2
  • aou-2.1.3
  • aou-2.1.4
  • aou-2.1.5
  • aou-2.1.6
  • aou-2.1.7
  • aou-2.2.0
  • aou-2.2.1
68 results
Show changes
Commits on Source (2)
......@@ -203,7 +203,7 @@ export class DepositDetailRoutable extends SharedAbstractRoutable implements OnI
}
isDeleteAvailable(deposit: Deposit): boolean {
return isTrue(this.isCreatorOrContributor) && DepositHelper.isDeleteAvailable(this.isValidationMode, deposit?.status);
return (isTrue(this.isCreatorOrContributor) && DepositHelper.isDeleteAvailable(this.isValidationMode, this._securityService.isRootOrAdmin(), deposit?.status));
}
isEditAvailable(deposit: Deposit): boolean {
......@@ -908,7 +908,8 @@ export class DepositDetailRoutable extends SharedAbstractRoutable implements OnI
if (isNullOrUndefined(deposit) || deposit.status === Enums.Deposit.StatusEnum.COMPLETED) {
return;
}
this._store.dispatch(new DepositAction.ValidateMetadata(deposit.resId, this.isValidationMode && deposit.status === Enums.Deposit.StatusEnum.IN_VALIDATION));
this._store.dispatch(new DepositAction.ValidateMetadata(deposit.resId, this.isValidationMode
&& [Enums.Deposit.StatusEnum.IN_VALIDATION, Enums.Deposit.StatusEnum.UPDATES_VALIDATION].includes(deposit.status)));
}
private _isStructureFromScienceOrChild(structure: Structure): boolean {
......
......@@ -637,7 +637,7 @@ export class DepositListRoutable extends AbstractListRoutable<Deposit, DepositSt
}
conditionDisplayDeleteButton(deposit: Deposit | undefined): boolean {
return DepositHelper.isDeleteAvailable(this.isValidationMode, deposit?.status);
return DepositHelper.isDeleteAvailable(this.isValidationMode, this._securityService.isRootOrAdmin(), deposit?.status);
}
override goToEdit(deposit: Deposit): void {
......
......@@ -101,8 +101,8 @@ export class DepositHelper {
subType === Enums.Deposit.DepositFriendlyNameSubTypeEnum.CONTRIBUTION_TO_A_DICTIONARY_ENCYCLOPAEDIA;
}
static isDeleteAvailable(isValidationMode: boolean, depositStatus: Enums.Deposit.StatusEnum): boolean {
if (isValidationMode) {
static isDeleteAvailable(isValidationMode: boolean, isRootOrAdmin: boolean, depositStatus: Enums.Deposit.StatusEnum): boolean {
if (isValidationMode && !isRootOrAdmin) {
return false;
}
return depositStatus === Enums.Deposit.StatusEnum.IN_PROGRESS || depositStatus === Enums.Deposit.StatusEnum.FEEDBACK_REQUIRED || depositStatus === Enums.Deposit.StatusEnum.IN_ERROR;
......