Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

1 changed file:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java
    ... ... @@ -77,11 +77,11 @@ public class RolesTableModel extends AbstractTableModel {
    77 77
             Collections.sort(roles);
    
    78 78
             for (ObserveDbUserDto role : roles) {
    
    79 79
                 String name = role.getName();
    
    80
    -            if (name.endsWith("-referentiel") || name.endsWith("-referential")) {
    
    80
    +            if (name.equals("referentiel") || name.equals("referential") || name.endsWith("-referentiel") || name.endsWith("-referential")) {
    
    81 81
                     role.setRole(ObserveDbRole.REFERENTIAL);
    
    82
    -            } else if (name.endsWith("-technicien") || name.endsWith("-technical")) {
    
    82
    +            } else if (name.equals("technicien") || name.equals("technician") || name.endsWith("-technicien") || name.endsWith("-technician")) {
    
    83 83
                     role.setRole(ObserveDbRole.TECHNICAL);
    
    84
    -            } else if (name.endsWith("-utilisateur") || name.endsWith("-user")) {
    
    84
    +            } else if (name.equals("utilisateur") || name.equals("user") ||name.endsWith("-utilisateur") || name.endsWith("-user")) {
    
    85 85
                     role.setRole(ObserveDbRole.USER);
    
    86 86
                 }
    
    87 87
             }