LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

In der Klasse ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java die FormProcessException in der Zeile 184 umgebaut und den key ui.folder.not_empty den Properties hinzugefügt.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3196 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-02-15 17:25:46 +00:00
parent be889a6c85
commit 75dbaba600
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources.properties
View File

@ -92,3 +92,4 @@ ui.portlet.action.new.doclink=New DocLink
ui.intended_audience_cannot_be_null=Intended Audience cannot be null ui.intended_audience_cannot_be_null=Intended Audience cannot be null
ui.error.sending_document=An error occurred while trying to send document ui.error.sending_document=An error occurred while trying to send document
ui.invalid_term=Invalid term ui.invalid_term=Invalid term
ui.folder.not_empty=Folders must be empty before they can be deleted

1
ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/DMResources_en.properties
View File

@ -92,3 +92,4 @@ ui.portlet.action.new.doclink=New DocLink
ui.intended_audience_cannot_be_null=Intended Audience cannot be null ui.intended_audience_cannot_be_null=Intended Audience cannot be null
ui.error.sending_document=An error occurred while trying to send document ui.error.sending_document=An error occurred while trying to send document
ui.invalid_term=Invalid term ui.invalid_term=Invalid term
ui.folder.not_empty=Folders must be empty before they can be deleted

7
ccm-docmgr/src/com/arsdigita/cms/docmgr/ui/FolderContentsTableForm.java
View File

@ -39,6 +39,7 @@ import com.arsdigita.cms.Folder;
import com.arsdigita.cms.docmgr.DocMgr; import com.arsdigita.cms.docmgr.DocMgr;
import com.arsdigita.cms.docmgr.Resource; import com.arsdigita.cms.docmgr.Resource;
import com.arsdigita.cms.docmgr.ui.PagingControlContainer; import com.arsdigita.cms.docmgr.ui.PagingControlContainer;
import com.arsdigita.cms.docmgr.util.GlobalizationUtil;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.globalization.GlobalizedMessage;
@ -180,10 +181,8 @@ class FolderContentsTableForm extends Form
(Resource) DomainObjectFactory.newInstance(oid); (Resource) DomainObjectFactory.newInstance(oid);
if (resource.isFolder()) { if (resource.isFolder()) {
if (! ((Folder) resource).isEmpty()) { if (! ((Folder) resource).isEmpty()) {
throw new FormProcessException throw new FormProcessException(GlobalizationUtil.globalize(
("Folders must be empty before they can be deleted. "+ "ui.folder.not_empty"));
"Attempted to delete non-empty folder "+
resource.getTitle());
} }
} }
} catch (PersistenceException exc) { } catch (PersistenceException exc) {