Merged V2.1 to HEAD

6933:  Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-11-12 16:07:55 +00:00
parent f9a456f870
commit f261c168b7
26 changed files with 135 additions and 133 deletions

View File

@@ -43,6 +43,7 @@ import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.data.QuickSort;
import org.alfresco.web.ui.common.Utils;
/**
* Bean implementation for the "Run Action" wizard.
@@ -176,8 +177,8 @@ public class RunActionWizard extends BaseActionWizard
StringBuilder actionsSummary = new StringBuilder();
for (Map<String, Serializable> props : this.allActionsProperties)
{
actionsSummary.append(props.get(PROP_ACTION_SUMMARY));
actionsSummary.append("<br/>");
actionsSummary.append(Utils.encode(props.get(PROP_ACTION_SUMMARY).toString()));
actionsSummary.append("<br>");
}
ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());