summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-09-19 07:25:49 (EDT)
committer Stephan Born2013-10-23 12:15:03 (EDT)
commit42aadb6833c1dd731efa5a050d691ac15c4d2ffb (patch)
tree96d8ca2bd016513b2fd43d26d4ca0020811d2659
parent68bc2b4865db5d27e50be6d32cb2752567d38fc2 (diff)
downloadorg.eclipse.stardust.ui.web-42aadb6833c1dd731efa5a050d691ac15c4d2ffb.zip
org.eclipse.stardust.ui.web-42aadb6833c1dd731efa5a050d691ac15c4d2ffb.tar.gz
org.eclipse.stardust.ui.web-42aadb6833c1dd731efa5a050d691ac15c4d2ffb.tar.bz2
Jira-ID: CRNT-30566
Merged b_dev_5_3_16_SPx changes for notesIframePopup.xhtml and DocumentMgmtUtility to trunk git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@67413 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml19
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/docmgmt/DocumentMgmtUtility.java15
2 files changed, 19 insertions, 15 deletions
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
index a19e444..c12d714 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/toolbar/notesIframePopup.xhtml
@@ -25,6 +25,7 @@
</c:forEach>
<script>
+ var alreadyClicked = false;
function windowLoaded()
{
var iFrameId = #{activityDetailsBean.notesIframePopupId};
@@ -48,7 +49,23 @@
function closeNotesIframe()
{
- window.setTimeout(function() {parent.BridgeUtils.View.syncActiveView();},200);
+ if(alreadyClicked)
+ {
+ ev.preventDefault();
+ if (evt.stopPropagation){
+ evt.stopPropagation();
+ }
+ if (evt.cancelBubble != null){ //Cancel event bubble
+ evt.cancelBubble = true;
+ }
+ return false;
+ }
+ else
+ {
+ alreadyClicked = true;
+ window.setTimeout(function() {parent.BridgeUtils.View.syncActiveView();},200);
+ return true;
+ }
}
</script>
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/docmgmt/DocumentMgmtUtility.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/docmgmt/DocumentMgmtUtility.java
index faefbd2..f52a77f 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/docmgmt/DocumentMgmtUtility.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/docmgmt/DocumentMgmtUtility.java
@@ -440,20 +440,7 @@ public class DocumentMgmtUtility
*/
public static Folder getFolder(String path)
{
- Folder folder = null;
- String searchString = org.eclipse.stardust.ui.web.viewscommon.utils.StringUtils.substringAfterLast(path, "/");
- searchString = DocumentMgmtUtility.replaceIllegalXpathSearchChars(searchString);
- List<Folder> newlist = getDocumentManagementService().findFoldersByName(searchString, Folder.LOD_NO_MEMBERS);
- for (Folder tempFolder : newlist)
- {
- if (path.equalsIgnoreCase(tempFolder.getPath()))
- {
- folder = tempFolder;
- break;
- }
- }
-
- return folder;
+ return getDocumentManagementService().getFolder(path);
}
/**