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

Commits:

2 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java
    ... ... @@ -118,8 +118,7 @@ public abstract class ContentListUIHandler<D extends DataDto, R extends DataDtoR
    118 118
         public final void onInit(U ui) {
    
    119 119
             super.onInit(ui);
    
    120 120
     
    
    121
    -        //FIXME Add this in states ?
    
    122
    -        //contentTitle='{ContentListUII18nHelper.getListTitle(getStates().getBeanType())}'
    
    121
    +        ui.getListHeader().setLabelText(getModel().getSource().getScope().getI18nTranslation("list.title"));
    
    123 122
             ui.getEmptyFormInformation().setText(getModel().getSource().getScope().getI18nTranslation("list.message.none"));
    
    124 123
             // set list renderer
    
    125 124
             ListCellRenderer renderer = ui.getList().getCellRenderer();
    

  • client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java
    ... ... @@ -127,11 +127,11 @@ public class CapabilityDescriptor {
    127 127
         public static final String INSTALL_CREATE_NEW_ACTION_WITH_PREDICATE2 = "" +
    
    128 128
                 "        installCreateNewOpenableAction(%1$s.class, %2$s.%3$s(ui, %4$s.class), getModel().getSource()::addEmpty%5$s);\n";
    
    129 129
         public static final String INSTALL_CREATE_NEW_ACTION_WITH_PREDICATE2_LIST = "" +
    
    130
    -            "        installCreateNewOpenableAction(%1$s.class, %2$s.%3$s(ui, %4$s.class), getModel().getSource().get%5$s()::addEmpty%6$s);\n";
    
    130
    +            "        installCreateNewOpenableAction(%1$s.class, %2$s.%3$s(ui, %4$s.class), () -> getModel().getSource().get%5$s().addEmpty%6$s());\n";
    
    131 131
         public static final String INSTALL_CREATE_NEW_ACTION2 = "" +
    
    132 132
                 "        installCreateNewOpenableAction(%1$s.class, t-> true, getModel().getSource()::addEmpty%2$s);\n";
    
    133 133
         public static final String INSTALL_CREATE_NEW_ACTION2_LIST = "" +
    
    134
    -            "        installCreateNewOpenableAction(%1$s.class, t-> true, getModel().getSource().get%2$s()::addEmpty%3$s);\n";
    
    134
    +            "        installCreateNewOpenableAction(%1$s.class, t-> true, () -> getModel().getSource().get%2$s().addEmpty%3$s());\n";
    
    135 135
         private final ContentNodeType contentNodeType;
    
    136 136
         private final CapacityNodeType capacityNodeType;
    
    137 137
         private final String nodeTypeName;