From: <die...@us...> - 2011-10-22 06:20:30
|
Revision: 3673 http://openutils.svn.sourceforge.net/openutils/?rev=3673&view=rev Author: diego_schivo Date: 2011-10-22 06:20:23 +0000 (Sat, 22 Oct 2011) Log Message: ----------- MEDIA-263 Add mediaType handling to media column type for grid control Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2011-10-21 15:49:23 UTC (rev 3672) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2011-10-22 06:20:23 UTC (rev 3673) @@ -68,7 +68,14 @@ protected void addColumnData(Map<String, String> column, String propertyName, int colIndex, Map colMap, Messages msgs) { - column.put("editor", "new Ed(new MediaField({}))"); + StringBuilder sb = new StringBuilder(); + sb.append("new Ed(new MediaField({"); + if (colMap.get("mediaType") != null) + { + sb.append("mediaType: '" + String.valueOf(colMap.get("mediaType")) + "'"); + } + sb.append("}))"); + column.put("editor", sb.toString()); column.put( "renderer", "function(v, p, record){ return v ? '<img border=\"0\" alt=\"\" src=\"" Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js 2011-10-21 15:49:23 UTC (rev 3672) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js 2011-10-22 06:20:23 UTC (rev 3673) @@ -2,13 +2,15 @@ triggerClass: 'x-form-media-trigger', + mediaType: '', + onTriggerClick: function(){ if (this.disabled) return; window.setNewMedia = function(nodeid, uuid, file, thumb){ this.setValue(uuid); }.createDelegate(this); - mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 840, 560); + mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mediaType=' + this.mediaType + '&mgnlCK=' + mgnlGetCacheKiller(), 840, 560); } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |