inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug when moving a locked node in the UI

Browse Source 
- Added 'run action' to menu for linked content and folders

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2006-05-23 10:42:09 +00:00
parent aa7c7c2db7
commit 5ce9b275cb
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-client-config-actions.xml
View File

@@ -601,6 +601,7 @@
<action idref="delete_doc" /> <action idref="delete_doc" />
<action idref="take_ownership_doc" /> <action idref="take_ownership_doc" />
<action idref="manage_content_users" /> <action idref="manage_content_users" />
<action idref="run_action" />
</action-group> </action-group>
<!-- Actions Menu for Folder Link Details screen --> <!-- Actions Menu for Folder Link Details screen -->
@@ -610,6 +611,7 @@
<action idref="delete_doc" /> <action idref="delete_doc" />
<action idref="take_ownership_space" /> <action idref="take_ownership_space" />
<action idref="manage_content_users" /> <action idref="manage_content_users" />
<action idref="run_action" />
</action-group> </action-group>
<!-- Actions Menu for Manage Rules screen --> <!-- Actions Menu for Manage Rules screen -->

9
source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileExistsException; import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.CopyService; import org.alfresco.service.cmr.repository.CopyService;
@@ -356,10 +357,18 @@ public class ClipboardBean
operationComplete = true; operationComplete = true;
} }
catch (FileExistsException fileExistsErr) catch (FileExistsException fileExistsErr)
{
if (item.Mode == ClipboardStatus.COPY)
{ {
String copyOf = Application.getMessage(FacesContext.getCurrentInstance(), MSG_COPY_OF); String copyOf = Application.getMessage(FacesContext.getCurrentInstance(), MSG_COPY_OF);
name = copyOf + ' ' + name; name = copyOf + ' ' + name;
} }
else
{
// we should not rename an item when it is being moved
throw fileExistsErr;
}
}
} }
} }