Changeset 7780
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemColumn.java
r7779 r7780 1 1 package net.sf.basedb.clients.web.extensions.list; 2 2 3 import java.util.HashMap; 4 import java.util.Map; 3 5 import java.util.Set; 4 6 … … 68 70 property = m.getPropertyPath(path, false); 69 71 col = new ParentItemPropertyColumn(index, expr, parentFilter, helper, property); 70 col.setTitle(subtype.getName()+"."+path );72 col.setTitle(subtype.getName()+"."+pathToTitle(path)); 71 73 col.setTooltip(subtype.getName() + " › "+path); 72 74 } … … 110 112 } 111 113 114 private static Map<String, String> pathTitles = new HashMap<>(); 115 116 static 117 { 118 // See also add_parent_columns.js 119 pathTitles.put("externalId", "External ID"); 120 pathTitles.put("bioWell.bioPlate", "Bioplate"); 121 pathTitles.put("entryDate", "Registered"); 122 pathTitles.put("remainingQuantity", "Remaining quantity"); 123 pathTitles.put("creationEvent.entryDate", "Registered"); 124 pathTitles.put("creationEvent.protocol", "Protocol"); 125 pathTitles.put("creationEvent.hardware", "Hardware"); 126 pathTitles.put("remainingQuantity", "Remaining quantity"); 127 } 128 129 /** 130 Convert some paths to a more user-friendly title instead. 131 */ 132 private static String pathToTitle(String path) 133 { 134 String title = pathTitles.get(path); 135 return title == null ? path.substring(0, 1).toUpperCase() + path.substring(1) : title; 136 } 137 112 138 private final int index; 113 139 private final Filter<Annotatable> filter; -
trunk/www/common/columns/add_parent_column.js
r7779 r7780 32 32 var currentAnnotationTypesCategory; 33 33 34 // See also net.sf.basedb.clients.web.extensions.list.ParentItemColumn.pathTitles 35 34 36 var nameCol = {'id': '.', 'text': 'Name'}; 35 37 var externalIdCol = {'id': 'externalId', 'text': 'External ID'}; … … 181 183 return; 182 184 } 185 data.subtypeName = frm.subtype[frm.subtype.selectedIndex].text; 183 186 184 187 var numSelected = 0; … … 190 193 data.column = col.value; 191 194 data.property = '/'+data.parentType+'/'+data.subtype+'/'+data.column; 192 data.title = col.value == '.' ? frm.subtype[frm.subtype.selectedIndex].text : col.text;195 data.title = data.subtypeName + (col.value == '.' ? '' : '.'+col.text); 193 196 Events.sendCustomEvent(window.opener.Doc.element('selectParentItemColumn'), 'base-selected', data); 194 197 numSelected++;
Note: See TracChangeset
for help on using the changeset viewer.