From 545673df9182b2a340edefac06f4ca06917d4bfd Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 9 Oct 2018 12:35:35 -0400 Subject: [PATCH 01/13] BuiltInRoles - creating property file with roles name and description --- src/main/java/BuiltInRoles.properties | 16 +++ src/main/java/BuiltInRoles_fr.properties | 16 +++ src/main/java/Bundle.properties | 29 ++++ src/main/java/Bundle_fr.properties | 29 ++++ .../iq/dataverse/ManagePermissionsPage.java | 131 +++++++++--------- .../authorization/DataverseRole.java | 20 ++- .../dataverse/authorization/Permission.java | 6 +- src/main/webapp/permissions-manage.xhtml | 2 +- src/main/webapp/roles-assign.xhtml | 2 +- src/main/webapp/roles-edit.xhtml | 2 +- 10 files changed, 182 insertions(+), 71 deletions(-) create mode 100644 src/main/java/BuiltInRoles.properties create mode 100644 src/main/java/BuiltInRoles_fr.properties diff --git a/src/main/java/BuiltInRoles.properties b/src/main/java/BuiltInRoles.properties new file mode 100644 index 00000000000..3c4b8020002 --- /dev/null +++ b/src/main/java/BuiltInRoles.properties @@ -0,0 +1,16 @@ +role.admin.name=Admin +role.admin.description=A person who has all permissions for dataverses, datasets, and files. +role.editor.name=Contributor +role.editor.description=For datasets, a person who can edit License + Terms, and then submit them for review. +role.curator.name=Curator +role.curator.description=For datasets, a person who can edit License + Terms, edit Permissions, and publish datasets. +role.dscontributor.name=Dataset Creator +role.dscontributor.description=A person who can add datasets within a dataverse. +role.fullcontributor.name=Dataverse + Dataset Creator +role.fullcontributor.description=A person who can add subdataverses and datasets within a dataverse. +role.dvcontributor.name=Dataverse Creator +role.dvcontributor.description=A person who can add subdataverses within a dataverse. +role.filedownloader.name=File Downloader +role.filedownloader.description=A person who can download a published file. +role.member.name=Member +role.member.description=A person who can view both unpublished dataverses and datasets. \ No newline at end of file diff --git a/src/main/java/BuiltInRoles_fr.properties b/src/main/java/BuiltInRoles_fr.properties new file mode 100644 index 00000000000..2ffd907b609 --- /dev/null +++ b/src/main/java/BuiltInRoles_fr.properties @@ -0,0 +1,16 @@ +role.admin.name=Administrateur +role.admin.description=Une personne disposant de toutes les autorisations sur les dataverses, les ensembles de données et les fichiers. +role.editor.name=Collaborateur +role.editor.description=Pour les ensembles de données, une personne pouvant modifier la licence et les conditions, puis les soumettre pour révision. +role.curator.name=Curateur +role.curator.description=Pour les ensembles de données, une personne pouvant modifier la licence et les conditions, éditer les autorisations, et publier des ensembles de données. +role.dscontributor.name=Créateur d'ensembles de données +role.dscontributor.description=Une personne qui peut ajouter des ensembles de données dans un dataverse. +role.fullcontributor.name=Créateur de dataverse et d'ensembles de données +role.fullcontributor.description=Une personne qui peut ajouter des sous-dataverses et des ensembles de données dans un dataverse. +role.dvcontributor.name=Créateur de dataverse +role.dvcontributor.description=Une personne qui peut ajouter des sous-dataverses dans un dataverse. +role.filedownloader.name=Téléchargeur de fichiers +role.filedownloader.description=Une personne qui peut télécharger un fichier publié. +role.member.name=Membre +role.member.description=Une personne qui peut consulter les dataverses et les ensembles de données non publiés. \ No newline at end of file diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 03187e0cdf8..c30d8f0a335 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -2069,3 +2069,32 @@ admin.api.migrateHDL.failure.must.be.hdl.dataset=Dataset was not registered as a admin.api.migrateHDL.success=Dataset migrate HDL registration complete. Dataset re-registered successfully. admin.api.migrateHDL.failure=Failed to migrate Dataset Handle id: {0} admin.api.migrateHDL.failureWithException=Failed to migrate Dataset Handle id: {0} Unexpected exception: {1} + +#Roles +roles.AddDataverse=AddDataverse +roles.AddDataset=AddDataset +roles.ViewUnpublishedDataverse=ViewUnpublishedDataverse +roles.ViewUnpublishedDataset=ViewUnpublishedDataset +roles.DownloadFile=DownloadFile +roles.EditDataverse=EditDataverse +roles.EditDataset=EditDataset +roles.ManageDataversePermissions=ManageDataversePermissions +roles.ManageDatasetPermissions=ManageDatasetPermissions +roles.PublishDataverse=PublishDataverse +roles.PublishDataset=PublishDataset +roles.DeleteDataverse=DeleteDataverse +roles.DeleteDatasetDraft=DeleteDatasetDraft + +permission.AddDataverse=Add a dataverse within another dataverse +permission.DeleteDatasetDraft=Delete a dataset draft +permission.DeleteDataverse=Delete an unpublished dataverse +permission.PublishDataset=Publish a dataset +permission.PublishDataverse=Publish a dataverse +permission.ManageDatasetPermissions=Manage permissions for a dataset +permission.ManageDataversePermissions=Manage permissions for a dataverse +permission.EditDataset=Edit a dataset's metadata +permission.EditDataverse=Edit a dataverse's metadata, facets, customization, and templates +permission.DownloadFile=Download a file +permission.ViewUnpublishedDataset=View an unpublished dataset and its files +permission.ViewUnpublishedDataverse=View an unpublished dataverse +permission.AddDataset=Add a dataset to a dataverse \ No newline at end of file diff --git a/src/main/java/Bundle_fr.properties b/src/main/java/Bundle_fr.properties index 8d37eb21f23..bc367b4bd79 100644 --- a/src/main/java/Bundle_fr.properties +++ b/src/main/java/Bundle_fr.properties @@ -2063,3 +2063,32 @@ admin.api.migrateHDL.failure.must.be.hdl.dataset=L'ensemble de donn admin.api.migrateHDL.success=La migration de l'ensemble de données est terminée. Ensemble de données ré-enregistré avec succès. admin.api.migrateHDL.failure=Échec de la migration de l'ensemble de données ayant l''identifiant Handle\u00A0: {0} admin.api.migrateHDL.failureWithException=Échec de la migration de l'ensemble de données ayant l''identifiant Handle\u00A0: {0}. Exception inattendue\u00A0: {1} + +#Roles +roles.AddDataverse=AjoutDataverse +roles.AddDataset=AjoutEnsembleDeDonnées +roles.ViewUnpublishedDataverse=ConsultationDataverseNonPublié +roles.ViewUnpublishedDataset=ConsultationEnsembleDeDonnéesNonPublié +roles.DownloadFile=TéléchargementFichier +roles.EditDataverse=ÉditionDataverse +roles.EditDataset=ÉditionEnsembleDeDonnées +roles.ManageDataversePermissions=GestionAutorisationsDataverse +roles.ManageDatasetPermissions=GestionAutorisationsEnsembleDeDonnées +roles.PublishDataverse=PublicationDataverse +roles.PublishDataset=PublicationEnsembleDeDonnées +roles.DeleteDataverse=SuppressionDataverse +roles.DeleteDatasetDraft=SuppressionVersionProvisoireEnsembleDeDonnées + +permission.AddDataverse=Ajouter un dataverse à l'intérieur d'un autre dataverse +permission.DeleteDatasetDraft=Supprimer la version provisoire de l'ensemble de données +permission.DeleteDataverse=Supprimer un dataverse non publié +permission.PublishDataset=Publier un ensemble de données +permission.PublishDataverse=Publier un dataverse +permission.ManageDatasetPermissions=Gérer les autorisations pour un ensemble de données +permission.ManageDataversePermissions=Gérer les autorisations pour un dataverse +permission.EditDataset=Éditer les métadonnées d'un ensemble de données +permission.EditDataverse=Éditer les métadonnées, les facettes, la personnalisation et les modèles +permission.DownloadFile=Télécharger un fichier +permission.ViewUnpublishedDataset=Consulter un ensemble de données non publié et ses fichiers +permission.ViewUnpublishedDataverse=Consulter un dataverse non publié +permission.AddDataset=Ajouter un ensemble de données à un dataverse diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java index c089ae1b67d..f7997797b47 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java @@ -1,3 +1,4 @@ + package edu.harvard.iq.dataverse; import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean; @@ -64,7 +65,7 @@ public class ManagePermissionsPage implements java.io.Serializable { AuthenticationServiceBean authenticationService; @EJB ExplicitGroupServiceBean explicitGroupService; - @EJB + @EJB GroupServiceBean groupService; @EJB EjbDataverseEngine commandEngine; @@ -81,12 +82,12 @@ public class ManagePermissionsPage implements java.io.Serializable { @Inject DataverseSession session; - + private DataverseRolePermissionHelper dataverseRolePermissionHelper; - private List roleList; + private List roleList; DvObject dvObject = new Dataverse(); // by default we use a Dataverse, but this will be overridden in init by the findById - + public DvObject getDvObject() { return dvObject; } @@ -96,7 +97,7 @@ public void setDvObject(DvObject dvObject) { /* SEK 09/15/2016 - may need to do something here if permissions are transmitted/inherited from dataverse to dataverse */ - + /*if (dvObject instanceof DvObjectContainer) { inheritAssignments = !((DvObjectContainer) dvObject).isPermissionRoot(); }*/ @@ -125,14 +126,14 @@ public String init() { } roleList = roleService.findAll(); roleAssignments = initRoleAssignments(); - dataverseRolePermissionHelper = new DataverseRolePermissionHelper(roleList); + dataverseRolePermissionHelper = new DataverseRolePermissionHelper(roleList); return ""; } - /* + /* main page - role assignment table */ - + // used by remove Role Assignment private RoleAssignment selectedRoleAssignment; @@ -142,8 +143,8 @@ public RoleAssignment getSelectedRoleAssignment() { public void setSelectedRoleAssignment(RoleAssignment selectedRoleAssignment) { this.selectedRoleAssignment = selectedRoleAssignment; - } - + } + private List roleAssignments; public List getRoleAssignments() { @@ -153,7 +154,7 @@ public List getRoleAssignments() { public void setRoleAssignments(List roleAssignments) { this.roleAssignments = roleAssignments; } - + public List initRoleAssignments() { List raList = null; if (dvObject != null && dvObject.getId() != null) { @@ -173,17 +174,17 @@ public List initRoleAssignments() { } return raList; } - + public void removeRoleAssignment() { revokeRole(selectedRoleAssignment); if (dvObject instanceof Dataverse) { initAccessSettings(); // in case the revoke was for the AuthenticatedUsers group - } + } roleAssignments = initRoleAssignments(); - showAssignmentMessages(); + showAssignmentMessages(); } - + // internal method used by removeRoleAssignment and saveConfiguration private void revokeRole(RoleAssignment ra) { try { @@ -198,10 +199,10 @@ private void revokeRole(RoleAssignment ra) { logger.log(Level.SEVERE, "Error removing role assignment: " + ex.getMessage(), ex); } } - - /* + + /* main page - roles table - */ + */ public List getRoles() { if (dvObject != null && dvObject.getId() != null) { @@ -227,13 +228,13 @@ public void cloneRole(String roleId) { public void editRole(String roleId) { setRole(roleService.find(Long.parseLong(roleId))); } - + /* ============================================================================ edit configuration dialog // only for dataverse version of page ============================================================================ */ - + private String authenticatedUsersContributorRoleAlias = null; private String defaultContributorRoleAlias = DataverseRole.EDITOR; @@ -251,10 +252,10 @@ public String getDefaultContributorRoleAlias() { public void setDefaultContributorRoleAlias(String defaultContributorRoleAlias) { this.defaultContributorRoleAlias = defaultContributorRoleAlias; - } - - public void initAccessSettings() { - if (dvObject instanceof Dataverse) { + } + + public void initAccessSettings() { + if (dvObject instanceof Dataverse) { authenticatedUsersContributorRoleAlias = ""; List aUsersRoleAssignments = roleService.directRoleAssignments(AuthenticatedUsers.get(), dvObject); @@ -265,12 +266,12 @@ public void initAccessSettings() { // @todo handle case where more than one role has been assigned to the AutenticatedUsers group! } - defaultContributorRoleAlias = ((Dataverse) dvObject).getDefaultContributorRole().getAlias(); - } + defaultContributorRoleAlias = ((Dataverse) dvObject).getDefaultContributorRole().getAlias(); + } } - - - public void saveConfiguration(ActionEvent e) { + + + public void saveConfiguration(ActionEvent e) { // Set role (if any) for authenticatedUsers DataverseRole roleToAssign = null; List contributorRoles = Arrays.asList(DataverseRole.FULL_CONTRIBUTOR, DataverseRole.DV_CONTRIBUTOR, DataverseRole.DS_CONTRIBUTOR); @@ -306,7 +307,7 @@ public void saveConfiguration(ActionEvent e) { JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.defaultPermissionDataverseUpdated")); } catch (PermissionException ex) { JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("permission.CannotAssigntDefaultPermissions"), - BundleUtil.getStringFromBundle("permission.permissionsMissing" , Arrays.asList(ex.getRequiredPermissions().toString()))); + BundleUtil.getStringFromBundle("permission.permissionsMissing" , Arrays.asList(ex.getRequiredPermissions().toString()))); } catch (CommandException ex) { JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("permission.CannotAssigntDefaultPermissions")); @@ -316,7 +317,7 @@ public void saveConfiguration(ActionEvent e) { } roleAssignments = initRoleAssignments(); showConfigureMessages(); - } + } /* ============================================================================ @@ -347,18 +348,18 @@ public void initAssigneeDialog(ActionEvent ae) { selectedRoleId = null; showNoMessages(); } - + public List completeRoleAssignee( String query ) { - return roleAssigneeService.filterRoleAssignees(query, dvObject, roleAssignSelectedRoleAssignees); + return roleAssigneeService.filterRoleAssignees(query, dvObject, roleAssignSelectedRoleAssignees); } - + public List getAvailableRoles() { List roles = new LinkedList<>(); if (dvObject != null && dvObject.getId() != null) { if (dvObject instanceof Dataverse) { roles.addAll(roleService.availableRoles(dvObject.getId())); - + } else if (dvObject instanceof Dataset) { // don't show roles that only have Dataverse level permissions // current the available roles for a dataset are gotten from its parent @@ -370,11 +371,11 @@ public List getAvailableRoles() { } } } - + } else if (dvObject instanceof DataFile) { roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER)); } - + Collections.sort(roles, DataverseRole.CMP_BY_NAME); } return roles; @@ -386,13 +387,13 @@ public DataverseRole getAssignedRole() { } return null; } - + public String getAssignedRoleObjectTypes(){ String retString = ""; if (selectedRoleId != null) { - /* SEK 09/15/2016 SEK commenting out for now + /* SEK 09/15/2016 SEK commenting out for now because permissions are not inherited - + if (dataverseRolePermissionHelper.hasDataversePermissions(selectedRoleId) && dvObject instanceof Dataverse){ String dvLabel = BundleUtil.getStringFromBundle("dataverses"); retString = dvLabel; @@ -403,23 +404,23 @@ public String getAssignedRoleObjectTypes(){ if(!retString.isEmpty()) { retString +=", " + dsLabel; } else { - retString = dsLabel; + retString = dsLabel; } - + } if (dataverseRolePermissionHelper.hasFilePermissions(selectedRoleId)){ String filesLabel = BundleUtil.getStringFromBundle("files"); if(!retString.isEmpty()) { retString +=", " + filesLabel; } else { - retString = filesLabel; - } + retString = filesLabel; + } } return retString; } - return null; + return null; } - + public String getDefinitionLevelString(){ if (dvObject != null){ if (dvObject instanceof Dataverse) return BundleUtil.getStringFromBundle("dataverse"); @@ -428,7 +429,7 @@ public String getDefinitionLevelString(){ return null; } - public void assignRole(ActionEvent evt) { + public void assignRole(ActionEvent evt) { logger.info("Got to assignRole"); List selectedRoleAssigneesList = getRoleAssignSelectedRoleAssignees(); if ( selectedRoleAssigneesList == null ) { @@ -438,7 +439,7 @@ public void assignRole(ActionEvent evt) { for (RoleAssignee roleAssignee : selectedRoleAssigneesList) { assignRole(roleAssignee, roleService.find(selectedRoleId)); } - roleAssignments = initRoleAssignments(); + roleAssignments = initRoleAssignments(); } /** @@ -449,7 +450,7 @@ public void assignRole(ActionEvent evt) { */ private void notifyRoleChange(RoleAssignee ra, UserNotification.Type type) { if (ra instanceof AuthenticatedUser) { - userNotificationService.sendNotification((AuthenticatedUser) ra, new Timestamp(new Date().getTime()), type, dvObject.getId()); + userNotificationService.sendNotification((AuthenticatedUser) ra, new Timestamp(new Date().getTime()), type, dvObject.getId()); } else if (ra instanceof ExplicitGroup) { ExplicitGroup eg = (ExplicitGroup) ra; Set explicitGroupMembers = eg.getContainedRoleAssgineeIdentifiers(); @@ -474,7 +475,7 @@ private void assignRole(RoleAssignee ra, DataverseRole r) { JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("permission.roleAssignedToFor", args)); // don't notify if role = file downloader and object is not released if (!(r.getAlias().equals(DataverseRole.FILE_DOWNLOADER) && !dvObject.isReleased()) ){ - notifyRoleChange(ra, UserNotification.Type.ASSIGNROLE); + notifyRoleChange(ra, UserNotification.Type.ASSIGNROLE); } } catch (PermissionException ex) { @@ -490,7 +491,7 @@ private void assignRole(RoleAssignee ra, DataverseRole r) { //JH.addMessage(FacesMessage.SEVERITY_FATAL, "The role was not able to be assigned."); logger.log(Level.SEVERE, "Error assiging role: " + ex.getMessage(), ex); } - + showAssignmentMessages(); } @@ -549,8 +550,8 @@ public void updateRole(ActionEvent e) { } showRoleMessages(); } - - + + public DataverseRolePermissionHelper getDataverseRolePermissionHelper() { return dataverseRolePermissionHelper; } @@ -559,39 +560,39 @@ public void setDataverseRolePermissionHelper(DataverseRolePermissionHelper datav this.dataverseRolePermissionHelper = dataverseRolePermissionHelper; } - /* + /* ============================================================================ Internal methods ============================================================================ */ - + boolean renderConfigureMessages = false; boolean renderAssignmentMessages = false; - boolean renderRoleMessages = false; - + boolean renderRoleMessages = false; + private void showNoMessages() { renderConfigureMessages = false; renderAssignmentMessages = false; renderRoleMessages = false; - } - + } + private void showConfigureMessages() { renderConfigureMessages = true; renderAssignmentMessages = false; renderRoleMessages = false; } - + private void showAssignmentMessages() { renderConfigureMessages = false; renderAssignmentMessages = true; renderRoleMessages = false; } - + private void showRoleMessages() { renderConfigureMessages = false; renderAssignmentMessages = false; renderRoleMessages = true; - } + } public Boolean getRenderConfigureMessages() { return renderConfigureMessages; @@ -627,10 +628,10 @@ public RoleAssignmentRow(RoleAssignment anRa, RoleAssigneeDisplayInfo disInf) { ra = anRa; assigneeDisplayInfo = disInf; } - + public RoleAssignment getRoleAssignment() { return ra; - } + } public RoleAssigneeDisplayInfo getAssigneeDisplayInfo() { return assigneeDisplayInfo; @@ -643,7 +644,7 @@ public DataverseRole getRole() { public String getRoleName() { return getRole().getName(); } - + public DvObject getDefinitionPoint() { return ra.getDefinitionPoint(); diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java index 501a0db6414..ffbe9c9117f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java @@ -3,6 +3,8 @@ import edu.harvard.iq.dataverse.Dataverse; import edu.harvard.iq.dataverse.DvObject; import edu.harvard.iq.dataverse.util.BitSet; +import edu.harvard.iq.dataverse.util.BundleUtil; + import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -117,7 +119,14 @@ public void setId(Long id) { } public String getName() { - return name; + if (alias != null ) + { + String key = "role." + alias.toLowerCase() +".name"; + return BundleUtil.getStringFromPropertyFile(key,"BuiltInRoles" ); + } + else { + return name; + } } public void setName(String name) { @@ -125,7 +134,14 @@ public void setName(String name) { } public String getDescription() { - return description; + if (alias != null ) + { + String key = "role." + alias.toLowerCase() +".description"; + return BundleUtil.getStringFromPropertyFile(key,"BuiltInRoles" ); + } + else { + return description; + } } public void setDescription(String description) { diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java index 5337d02d559..9d552489345 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java @@ -79,7 +79,11 @@ public enum Permission implements java.io.Serializable { } public String getHumanName() { - return humanName; + return BundleUtil.getStringFromBundle("permission."+name()); + } + + public String getDisplayName() { + return BundleUtil.getStringFromBundle("roles."+name()); } public boolean appliesTo(Class aClass) { diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml index 392690532fb..85b163fc8da 100644 --- a/src/main/webapp/permissions-manage.xhtml +++ b/src/main/webapp/permissions-manage.xhtml @@ -185,7 +185,7 @@ update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}">
- #{prm} + #{bundle['roles.'.concat(prm)]}
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml index 7b4c6ab52a8..2e2186af208 100644 --- a/src/main/webapp/roles-assign.xhtml +++ b/src/main/webapp/roles-assign.xhtml @@ -71,7 +71,7 @@
#{managePermissionsPage.assignedRole.description}
- #{prm} + #{bundle['roles.'.concat(prm)]}

diff --git a/src/main/webapp/roles-edit.xhtml b/src/main/webapp/roles-edit.xhtml index 9c9c2dc7da5..d7d0f9f53bf 100644 --- a/src/main/webapp/roles-edit.xhtml +++ b/src/main/webapp/roles-edit.xhtml @@ -60,7 +60,7 @@ From e6525d021bd551d595995599765f9a9e4b538590 Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 9 Oct 2018 15:04:54 -0400 Subject: [PATCH 02/13] correcting LocalBundle --- .../edu/harvard/iq/dataverse/util/LocalBundle.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java b/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java index 1431969cee9..01d1d9afc76 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java @@ -25,20 +25,14 @@ public class LocalBundle extends ResourceBundle { public LocalBundle(){ DataverseLocaleBean d = new DataverseLocaleBean(); - bundle_locale= new Locale(d.getLocaleCode()); + bundle_locale = new Locale(d.getLocaleCode()); String filesRootDirectory = System.getProperty("dataverse.lang.directory"); - if (filesRootDirectory == null || filesRootDirectory.isEmpty()) { - filesRootDirectory = "/tmp/lang"; - } - File bundleFileDir = new File(filesRootDirectory); - if (!bundleFileDir.exists()) - { + if (filesRootDirectory == null || filesRootDirectory.isEmpty()) { bundle = ResourceBundle.getBundle(defaultBundleFile, bundle_locale); - } - else { - + } else { + File bundleFileDir = new File(filesRootDirectory); URL[] urls = null; try { urls = new URL[]{bundleFileDir.toURI().toURL()}; From cc69db04623f8126bf85ebcf603551c133e1774c Mon Sep 17 00:00:00 2001 From: chenganj Date: Thu, 11 Oct 2018 11:56:14 -0400 Subject: [PATCH 03/13] Testing JH_Localize --- .../edu/harvard/iq/dataverse/ManageGuestbooksPage.java | 7 +++---- src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java index 564cddcbfe3..f126924bc3f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java @@ -83,10 +83,9 @@ public String init() { if(totalResponses.intValue() > 0){ displayDownloadAll = true; FacesContext.getCurrentInstance().addMessage(null, - new FacesMessage(FacesMessage.SEVERITY_INFO, - JH.localize("dataset.manageGuestbooks.tip.title"), - JH.localize("dataset.manageGuestbooks.tip.downloadascsv"))); - + new FacesMessage(FacesMessage.SEVERITY_INFO, + BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.title"), + BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.downloadascsv"))); } dvpage.setDataverse(dataverse); diff --git a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java index 67b8fba41f4..85e0db7f95f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java @@ -60,6 +60,7 @@ public String localize( String messageKey ) { FacesContext facesContext = FacesContext.getCurrentInstance(); String messageBundleName = facesContext.getApplication().getMessageBundle(); Locale locale = facesContext.getViewRoot().getLocale(); + logger.log(Level.WARNING, " JH LOCALIZE--------- " +locale.getLanguage()); ResourceBundle bundle = ResourceBundle.getBundle("Bundle", locale); return bundle.getString(messageKey); } From 4e59e2586446fa501115f0aba0847dce96a22597 Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 12:10:17 -0400 Subject: [PATCH 04/13] added + @@ -1599,4 +1600,5 @@ + diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml index 29dfbc8a950..be9131d6929 100644 --- a/src/main/webapp/guestbook-responses.xhtml +++ b/src/main/webapp/guestbook-responses.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -92,5 +92,6 @@ + diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml index 3311bddb115..0b44424b804 100644 --- a/src/main/webapp/manage-guestbooks.xhtml +++ b/src/main/webapp/manage-guestbooks.xhtml @@ -6,6 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:o="http://omnifaces.org/ui"> + @@ -226,4 +227,5 @@ + From b9e283b2685913db78653709320b56c8a70e478c Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 12:23:20 -0400 Subject: [PATCH 05/13] Revert "Testing JH_Localize" This reverts commit cc69db0 --- .../edu/harvard/iq/dataverse/ManageGuestbooksPage.java | 7 ++++--- src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java index f126924bc3f..564cddcbfe3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java @@ -83,9 +83,10 @@ public String init() { if(totalResponses.intValue() > 0){ displayDownloadAll = true; FacesContext.getCurrentInstance().addMessage(null, - new FacesMessage(FacesMessage.SEVERITY_INFO, - BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.title"), - BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.downloadascsv"))); + new FacesMessage(FacesMessage.SEVERITY_INFO, + JH.localize("dataset.manageGuestbooks.tip.title"), + JH.localize("dataset.manageGuestbooks.tip.downloadascsv"))); + } dvpage.setDataverse(dataverse); diff --git a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java index 85e0db7f95f..67b8fba41f4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java @@ -60,7 +60,6 @@ public String localize( String messageKey ) { FacesContext facesContext = FacesContext.getCurrentInstance(); String messageBundleName = facesContext.getApplication().getMessageBundle(); Locale locale = facesContext.getViewRoot().getLocale(); - logger.log(Level.WARNING, " JH LOCALIZE--------- " +locale.getLanguage()); ResourceBundle bundle = ResourceBundle.getBundle("Bundle", locale); return bundle.getString(messageKey); } From e51323a14dccc60bc912412e500e192ab94d16fb Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 12:29:39 -0400 Subject: [PATCH 06/13] Revert "added - @@ -1600,5 +1599,4 @@ - diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml index be9131d6929..29dfbc8a950 100644 --- a/src/main/webapp/guestbook-responses.xhtml +++ b/src/main/webapp/guestbook-responses.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -92,6 +92,5 @@ - diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml index 0b44424b804..3311bddb115 100644 --- a/src/main/webapp/manage-guestbooks.xhtml +++ b/src/main/webapp/manage-guestbooks.xhtml @@ -6,7 +6,6 @@ xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:o="http://omnifaces.org/ui"> - @@ -227,5 +226,4 @@ - From fc8c02a3c73bf1670d5776b92acc2c5e90b7b22a Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 12:32:03 -0400 Subject: [PATCH 07/13] Revert "correcting LocalBundle" This reverts commit e6525d0 --- .../edu/harvard/iq/dataverse/util/LocalBundle.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java b/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java index 01d1d9afc76..1431969cee9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/LocalBundle.java @@ -25,14 +25,20 @@ public class LocalBundle extends ResourceBundle { public LocalBundle(){ DataverseLocaleBean d = new DataverseLocaleBean(); - bundle_locale = new Locale(d.getLocaleCode()); + bundle_locale= new Locale(d.getLocaleCode()); String filesRootDirectory = System.getProperty("dataverse.lang.directory"); - if (filesRootDirectory == null || filesRootDirectory.isEmpty()) { + filesRootDirectory = "/tmp/lang"; + } + File bundleFileDir = new File(filesRootDirectory); + + if (!bundleFileDir.exists()) + { bundle = ResourceBundle.getBundle(defaultBundleFile, bundle_locale); - } else { - File bundleFileDir = new File(filesRootDirectory); + } + else { + URL[] urls = null; try { urls = new URL[]{bundleFileDir.toURI().toURL()}; From fef8ba3a864b40e8d455a52242d9ea2e97719a78 Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 13:10:15 -0400 Subject: [PATCH 08/13] testing in dvdev --- .../iq/dataverse/ManagePermissionsPage.java | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java index f7997797b47..4a284e50c59 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java @@ -354,29 +354,38 @@ public List completeRoleAssignee( String query ) { } public List getAvailableRoles() { - List roles = new LinkedList<>(); - if (dvObject != null && dvObject.getId() != null) { - if (dvObject instanceof Dataverse) { - roles.addAll(roleService.availableRoles(dvObject.getId())); - - } else if (dvObject instanceof Dataset) { - // don't show roles that only have Dataverse level permissions - // current the available roles for a dataset are gotten from its parent - for (DataverseRole role : roleService.availableRoles(dvObject.getOwner().getId())) { - for (Permission permission : role.permissions()) { - if (permission.appliesTo(Dataset.class) || permission.appliesTo(DataFile.class)) { - roles.add(role); - break; + try { + List roles = new LinkedList<>(); + if (dvObject != null && dvObject.getId() != null) { + + if (dvObject instanceof Dataverse) { + roles.addAll(roleService.availableRoles(dvObject.getId())); + + } else if (dvObject instanceof Dataset) { + // don't show roles that only have Dataverse level permissions + // current the available roles for a dataset are gotten from its parent + for (DataverseRole role : roleService.availableRoles(dvObject.getOwner().getId())) { + for (Permission permission : role.permissions()) { + if (permission.appliesTo(Dataset.class) || permission.appliesTo(DataFile.class)) { + roles.add(role); + break; + } } } + + } else if (dvObject instanceof DataFile) { + roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER)); } - } else if (dvObject instanceof DataFile) { - roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER)); - } - Collections.sort(roles, DataverseRole.CMP_BY_NAME); + Collections.sort(roles, DataverseRole.CMP_BY_NAME); + } + }catch (Exception e) + { + System.out.println("===================================================="); + e.printStackTrace(); + System.out.println("===================================================="); } return roles; } From 033855c558f55f7827a81c2d3d4ea9d678729229 Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 13:13:07 -0400 Subject: [PATCH 09/13] testing in dvdev --- .../java/edu/harvard/iq/dataverse/ManagePermissionsPage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java index 4a284e50c59..3cf3bfc8920 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java @@ -355,8 +355,9 @@ public List completeRoleAssignee( String query ) { public List getAvailableRoles() { + List roles = new LinkedList<>(); try { - List roles = new LinkedList<>(); + if (dvObject != null && dvObject.getId() != null) { if (dvObject instanceof Dataverse) { From 24e7fffdde059bebcf69cb7c401168ce87f0f334 Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 14:33:20 -0400 Subject: [PATCH 10/13] testing custom role in dvdev --- .../authorization/DataverseRole.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java index ffbe9c9117f..0ba15e6edba 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java @@ -122,7 +122,15 @@ public String getName() { if (alias != null ) { String key = "role." + alias.toLowerCase() +".name"; - return BundleUtil.getStringFromPropertyFile(key,"BuiltInRoles" ); + String _name = BundleUtil.getStringFromPropertyFile(key,"BuiltInRoles" ); + if(_name == null) + { + return name; + } + else + { + return _name; + } } else { return name; @@ -137,7 +145,15 @@ public String getDescription() { if (alias != null ) { String key = "role." + alias.toLowerCase() +".description"; - return BundleUtil.getStringFromPropertyFile(key,"BuiltInRoles" ); + String _description = BundleUtil.getStringFromPropertyFile(key,"BuiltInRoles" ); + if(_description == null) + { + return description; + } + else + { + return _description; + } } else { return description; From cee74784553bdb4975543a89f113847b8931661b Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 17 Oct 2018 14:53:23 -0400 Subject: [PATCH 11/13] reverted changes --- .../iq/dataverse/ManagePermissionsPage.java | 42 +++++++------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java index 3cf3bfc8920..f7997797b47 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java @@ -354,39 +354,29 @@ public List completeRoleAssignee( String query ) { } public List getAvailableRoles() { - List roles = new LinkedList<>(); - try { - - if (dvObject != null && dvObject.getId() != null) { - - if (dvObject instanceof Dataverse) { - roles.addAll(roleService.availableRoles(dvObject.getId())); + if (dvObject != null && dvObject.getId() != null) { - } else if (dvObject instanceof Dataset) { - // don't show roles that only have Dataverse level permissions - // current the available roles for a dataset are gotten from its parent - for (DataverseRole role : roleService.availableRoles(dvObject.getOwner().getId())) { - for (Permission permission : role.permissions()) { - if (permission.appliesTo(Dataset.class) || permission.appliesTo(DataFile.class)) { - roles.add(role); - break; - } + if (dvObject instanceof Dataverse) { + roles.addAll(roleService.availableRoles(dvObject.getId())); + + } else if (dvObject instanceof Dataset) { + // don't show roles that only have Dataverse level permissions + // current the available roles for a dataset are gotten from its parent + for (DataverseRole role : roleService.availableRoles(dvObject.getOwner().getId())) { + for (Permission permission : role.permissions()) { + if (permission.appliesTo(Dataset.class) || permission.appliesTo(DataFile.class)) { + roles.add(role); + break; } } - - } else if (dvObject instanceof DataFile) { - roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER)); } - - Collections.sort(roles, DataverseRole.CMP_BY_NAME); + } else if (dvObject instanceof DataFile) { + roles.add(roleService.findBuiltinRoleByAlias(DataverseRole.FILE_DOWNLOADER)); } - }catch (Exception e) - { - System.out.println("===================================================="); - e.printStackTrace(); - System.out.println("===================================================="); + + Collections.sort(roles, DataverseRole.CMP_BY_NAME); } return roles; } From 28d05a43b68bf5be2a1abedf3ba935e22bc1216c Mon Sep 17 00:00:00 2001 From: chenganj Date: Mon, 22 Oct 2018 11:36:37 -0400 Subject: [PATCH 12/13] corrected bundle property names for permission --- src/main/java/Bundle.properties | 29 ++++++++++ src/main/java/Bundle_fr.properties | 56 +++++++++---------- .../dataverse/authorization/Permission.java | 4 +- src/main/webapp/permissions-manage.xhtml | 2 +- src/main/webapp/roles-assign.xhtml | 2 +- 5 files changed, 61 insertions(+), 32 deletions(-) diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 6eadf21cb0d..4236718b527 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -2079,3 +2079,32 @@ datasets.api.updatePIDMetadata.failure.dataset.must.be.released=Modify Registrat datasets.api.updatePIDMetadata.auth.mustBeSuperUser=Forbidden. You must be a superuser. datasets.api.updatePIDMetadata.success.for.single.dataset=Dataset {0} PID Metadata updated successfully. datasets.api.updatePIDMetadata.success.for.update.all=All Dataset PID Metadata update completed successfully. + +#permission +permission.AddDataverse.label=AddDataverse +permission.AddDataset.label=AddDataset +permission.ViewUnpublishedDataverse.label=ViewUnpublishedDataverse +permission.ViewUnpublishedDataset.label=ViewUnpublishedDataset +permission.DownloadFile.label=DownloadFile +permission.EditDataverse.label=EditDataverse +permission.EditDataset.label=EditDataset +permission.ManageDataversePermissions.label=ManageDataversePermissions +permission.ManageDatasetPermissions.label=ManageDatasetPermissions +permission.PublishDataverse.label=PublishDataverse +permission.PublishDataset.label=PublishDataset +permission.DeleteDataverse.label=DeleteDataverse +permission.DeleteDatasetDraft.label=DeleteDatasetDraft + +permission.AddDataverse.desc=Add a dataverse within another dataverse +permission.DeleteDatasetDraft.desc=Delete a dataset draft +permission.DeleteDataverse.desc=Delete an unpublished dataverse +permission.PublishDataset.desc=Publish a dataset +permission.PublishDataverse.desc=Publish a dataverse +permission.ManageDatasetPermissions.desc=Manage permissions for a dataset +permission.ManageDataversePermissions.desc=Manage permissions for a dataverse +permission.EditDataset.desc=Edit a dataset's metadata +permission.EditDataverse.desc=Edit a dataverse's metadata, facets, customization, and templates +permission.DownloadFile.desc=Download a file +permission.ViewUnpublishedDataset.desc=View an unpublished dataset and its files +permission.ViewUnpublishedDataverse.desc=View an unpublished dataverse +permission.AddDataset.desc=Add a dataset to a dataverse \ No newline at end of file diff --git a/src/main/java/Bundle_fr.properties b/src/main/java/Bundle_fr.properties index bc367b4bd79..a1af215f0e0 100644 --- a/src/main/java/Bundle_fr.properties +++ b/src/main/java/Bundle_fr.properties @@ -2064,31 +2064,31 @@ admin.api.migrateHDL.success=La migration de l'ensemble de donn admin.api.migrateHDL.failure=Échec de la migration de l'ensemble de données ayant l''identifiant Handle\u00A0: {0} admin.api.migrateHDL.failureWithException=Échec de la migration de l'ensemble de données ayant l''identifiant Handle\u00A0: {0}. Exception inattendue\u00A0: {1} -#Roles -roles.AddDataverse=AjoutDataverse -roles.AddDataset=AjoutEnsembleDeDonnées -roles.ViewUnpublishedDataverse=ConsultationDataverseNonPublié -roles.ViewUnpublishedDataset=ConsultationEnsembleDeDonnéesNonPublié -roles.DownloadFile=TéléchargementFichier -roles.EditDataverse=ÉditionDataverse -roles.EditDataset=ÉditionEnsembleDeDonnées -roles.ManageDataversePermissions=GestionAutorisationsDataverse -roles.ManageDatasetPermissions=GestionAutorisationsEnsembleDeDonnées -roles.PublishDataverse=PublicationDataverse -roles.PublishDataset=PublicationEnsembleDeDonnées -roles.DeleteDataverse=SuppressionDataverse -roles.DeleteDatasetDraft=SuppressionVersionProvisoireEnsembleDeDonnées - -permission.AddDataverse=Ajouter un dataverse à l'intérieur d'un autre dataverse -permission.DeleteDatasetDraft=Supprimer la version provisoire de l'ensemble de données -permission.DeleteDataverse=Supprimer un dataverse non publié -permission.PublishDataset=Publier un ensemble de données -permission.PublishDataverse=Publier un dataverse -permission.ManageDatasetPermissions=Gérer les autorisations pour un ensemble de données -permission.ManageDataversePermissions=Gérer les autorisations pour un dataverse -permission.EditDataset=Éditer les métadonnées d'un ensemble de données -permission.EditDataverse=Éditer les métadonnées, les facettes, la personnalisation et les modèles -permission.DownloadFile=Télécharger un fichier -permission.ViewUnpublishedDataset=Consulter un ensemble de données non publié et ses fichiers -permission.ViewUnpublishedDataverse=Consulter un dataverse non publié -permission.AddDataset=Ajouter un ensemble de données à un dataverse +#permission +permission.AddDataverse.label=AjoutDataverse +permission.AddDataset.label=AjoutEnsembleDeDonnées +permission.ViewUnpublishedDataverse.label=ConsultationDataverseNonPublié +permission.ViewUnpublishedDataset.label=ConsultationEnsembleDeDonnéesNonPublié +permission.DownloadFile.label=TéléchargementFichier +permission.EditDataverse.label=ÉditionDataverse +permission.EditDataset.label=ÉditionEnsembleDeDonnées +permission.ManageDataversePermissions.label=GestionAutorisationsDataverse +permission.ManageDatasetPermissions.label=GestionAutorisationsEnsembleDeDonnées +permission.PublishDataverse.label=PublicationDataverse +permission.PublishDataset.label=PublicationEnsembleDeDonnées +permission.DeleteDataverse.label=SuppressionDataverse +permission.DeleteDatasetDraft.label=SuppressionVersionProvisoireEnsembleDeDonnées + +permission.AddDataverse.desc=Ajouter un dataverse à l'intérieur d'un autre dataverse +permission.DeleteDatasetDraft.desc=Supprimer la version provisoire de l'ensemble de données +permission.DeleteDataverse.desc=Supprimer un dataverse non publié +permission.PublishDataset.desc=Publier un ensemble de données +permission.PublishDataverse.desc=Publier un dataverse +permission.ManageDatasetPermissions.desc=Gérer les autorisations pour un ensemble de données +permission.ManageDataversePermissions.desc=Gérer les autorisations pour un dataverse +permission.EditDataset.desc=Éditer les métadonnées d'un ensemble de données +permission.EditDataverse.desc=Éditer les métadonnées, les facettes, la personnalisation et les modèles +permission.DownloadFile.desc=Télécharger un fichier +permission.ViewUnpublishedDataset.desc=Consulter un ensemble de données non publié et ses fichiers +permission.ViewUnpublishedDataverse.desc=Consulter un dataverse non publié +permission.AddDataset.desc=Ajouter un ensemble de données à un dataverse diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java index 9d552489345..7fd7a40587f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/Permission.java @@ -79,11 +79,11 @@ public enum Permission implements java.io.Serializable { } public String getHumanName() { - return BundleUtil.getStringFromBundle("permission."+name()); + return BundleUtil.getStringFromBundle("permission."+name()+".desc"); } public String getDisplayName() { - return BundleUtil.getStringFromBundle("roles."+name()); + return BundleUtil.getStringFromBundle("permission."+name()+".label"); } public boolean appliesTo(Class aClass) { diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml index 85b163fc8da..a4baa44ed36 100644 --- a/src/main/webapp/permissions-manage.xhtml +++ b/src/main/webapp/permissions-manage.xhtml @@ -185,7 +185,7 @@ update=":#{p:resolveClientId('rolesPermissionsForm:editRolePanel', view)}">

- #{bundle['roles.'.concat(prm)]} + #{bundle['permission.'.concat(prm).concat('.label')]}
diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml index 2e2186af208..94fea252cda 100644 --- a/src/main/webapp/roles-assign.xhtml +++ b/src/main/webapp/roles-assign.xhtml @@ -71,7 +71,7 @@
#{managePermissionsPage.assignedRole.description}
- #{bundle['roles.'.concat(prm)]} + #{bundle['permission.'.concat(prm).concat('.label')]}

From b49dff057068e13c642b6022192f45c3629c7fa1 Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 23 Oct 2018 12:49:07 -0400 Subject: [PATCH 13/13] fix to french property file --- src/main/java/BuiltInRoles_fr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/BuiltInRoles_fr.properties b/src/main/java/BuiltInRoles_fr.properties index 2ffd907b609..296b197d8e5 100644 --- a/src/main/java/BuiltInRoles_fr.properties +++ b/src/main/java/BuiltInRoles_fr.properties @@ -6,9 +6,9 @@ role.curator.name=Curateur role.curator.description=Pour les ensembles de données, une personne pouvant modifier la licence et les conditions, éditer les autorisations, et publier des ensembles de données. role.dscontributor.name=Créateur d'ensembles de données role.dscontributor.description=Une personne qui peut ajouter des ensembles de données dans un dataverse. -role.fullcontributor.name=Créateur de dataverse et d'ensembles de données +role.fullcontributor.name=Créateur de dataverses et d'ensembles de données role.fullcontributor.description=Une personne qui peut ajouter des sous-dataverses et des ensembles de données dans un dataverse. -role.dvcontributor.name=Créateur de dataverse +role.dvcontributor.name=Créateur de dataverses role.dvcontributor.description=Une personne qui peut ajouter des sous-dataverses dans un dataverse. role.filedownloader.name=Téléchargeur de fichiers role.filedownloader.description=Une personne qui peut télécharger un fichier publié.