[richfaces-svn-commits] JBoss Rich Faces SVN: r16263 - in branches/enterprise/3.3.X/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.

Author: konstantin.mishin Date: 2010-01-12 10:50:39 -0500 (Tue, 12 Jan 2010) New Revision: 16263 Modified: branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx Log: RFPL-228 porting RF-8053 to enterprise branch Modified: branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-01-12 14:47:48 UTC (rev 16262) +++ branches/enterprise/3.3.X/ui/fileUpload/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-01-12 15:50:39 UTC (rev 16263) @@ -469,6 +469,17 @@ } /** + * https://jira.jboss.org/jira/browse/RF-8053 - public hook to change action URL in portlet environment. + * @param context + * @return + */ + public String getActionUrl(FacesContext context){ + AjaxContext ajaxContext = org.ajax4jsf.context.AjaxContext.getCurrentInstance(context); + String ajaxActionUrl = ajaxContext.getAjaxActionURL(context); + return ajaxActionUrl; + } + + /** * Return accepted types map * * @param context Modified: branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx =================================================================== --- branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2010-01-12 14:47:48 UTC (rev 16262) +++ branches/enterprise/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2010-01-12 15:50:39 UTC (rev 16263) @@ -49,10 +49,6 @@ variables.setVariable("uploadLabel",labels.get("upload")); variables.setVariable("clearAllLabel",labels.get("clear_all")); - org.ajax4jsf.context.AjaxContext ajaxContext = org.ajax4jsf.context.AjaxContext.getCurrentInstance(context); - String ajaxActionUrl = ajaxContext.getAjaxActionURL(context); - - variables.setVariable("actionUrl", ajaxActionUrl); variables.setVariable("formId",getFormId(context, component)); variables.setVariable("containerId",getContainerId(context, component)); @@ -198,7 +194,7 @@ onfileuploadcomplete : #{this:getAsEventHandler(context, component, "onfileuploadcomplete")} }; - new FileUpload('#{clientId}','#{formId}','#{actionUrl}',#{this:getStopScript(context, component)}, #{this:getFileSizeScript(context, component)} ,'#{this:getProgressBarId(context, component)}', FileUpload.CLASSES, #{this:getLabelMarkup(context, component)}, #{maxCount}, events, #{component.attributes["disabled"]}, #{this:getAcceptedTypes(context, component)}, {'autoclear':#{component.attributes["autoclear"]},'autoUpload':#{component.attributes["immediateUpload"]},'noDuplicate':#{component.attributes["noDuplicate"]}, 'allowFlash':'#{allowFlash}', 'flashComponentUrl':'#{flashComponent}'},#{this:_getLabels(labels)},#{this:getChildrenParams(context, component)},'#{this:getSessionId(context, component)}'); + new FileUpload('#{clientId}','#{formId}','#{this:getActionUrl(context)}',#{this:getStopScript(context, component)}, #{this:getFileSizeScript(context, component)} ,'#{this:getProgressBarId(context, component)}', FileUpload.CLASSES, #{this:getLabelMarkup(context, component)}, #{maxCount}, events, #{component.attributes["disabled"]}, #{this:getAcceptedTypes(context, component)}, {'autoclear':#{component.attributes["autoclear"]},'autoUpload':#{component.attributes["immediateUpload"]},'noDuplicate':#{component.attributes["noDuplicate"]}, 'allowFlash':'#{allowFlash}', 'flashComponentUrl':'#{flashComponent}'},#{this:_getLabels(labels)},#{this:getChildrenParams(context, component)},'#{this:getSessionId(context, component)}'); </script> </span> <f:call name="utils.encodeEndFormIfNessesary" />