Project

General

Profile

Revision d096791b

IDd096791b048af2ef4bd541f54cb9e2de2127b955
Parent 6ad4af7d
Child b9033cb4

Added by Andreas Kohlbecker over 1 year ago

fix #8090 fixing missing inProceedings label in reference editor

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/reference/ReferencePopupEditor.java
103 103

  
104 104
    static {
105 105
        propertyNameLabelMap.put("inReference", "In reference");
106
        propertyNameLabelMap.put("inProceedings", "In proceedings");
106 107
        propertyNameLabelMap.put("inJournal", "In journal");
107 108
        propertyNameLabelMap.put("inSeries", "In series");
108 109
        propertyNameLabelMap.put("inBook", "In book");
......
330 331
            String inRefCaption = fieldPropertyDefinition.get("inReference");
331 332
            inReferenceCombobox.setVisible(inRefCaption != null);
332 333
            if(inRefCaption != null){
333
                inReferenceCombobox.setCaption(propertyNameLabelMap.get(inRefCaption));
334
                inReferenceCombobox.setCaption(inReferenceCaption(inRefCaption));
334 335
            }
335 336
            getField("title").setVisible(fieldPropertyDefinition.containsKey("title"));
336 337

  
......
345 346
                    grid.addComponent(field);
346 347
                    String propertyName = fieldPropertyDefinition.get(fieldName);
347 348
                    if(propertyName != fieldName){
348
                        field.setCaption(propertyNameLabelMap.get(propertyName));
349
                        field.setCaption(inReferenceCaption(propertyName));
349 350
                    }
350 351
                }
351 352
            }
......
363 364
    }
364 365

  
365 366
    /**
367
     * @param inRefCaption
368
     * @return
369
     */
370
    public String inReferenceCaption(String inRefCaption) {
371
        String caption = propertyNameLabelMap.get(inRefCaption);
372

  
373
        return caption != null ? caption : inRefCaption;
374
    }
375

  
376
    /**
366 377
     * @param grid
367 378
     */
368 379
    protected void initAdaptiveFields() {

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)