mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.1 to HEAD
6383: ML contributions 6400: AR-1625 Empty translations track pivot translation git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -31,13 +31,9 @@ import javax.faces.model.SelectItem;
|
||||
|
||||
import org.alfresco.i18n.I18NUtil;
|
||||
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
||||
import org.alfresco.service.cmr.repository.ContentData;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.web.app.servlet.DownloadContentServlet;
|
||||
import org.alfresco.web.bean.UserPreferencesBean;
|
||||
import org.alfresco.web.bean.content.AddContentDialog;
|
||||
import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.ui.common.Utils;
|
||||
|
||||
/**
|
||||
* Dialog bean to upload a new document and to add it to an existing MLContainer.
|
||||
@@ -81,31 +77,11 @@ public class AddTranslationDialog extends AddContentDialog
|
||||
{
|
||||
// add the new file to the repository
|
||||
outcome = super.finishImpl(context, outcome);
|
||||
|
||||
|
||||
// add a new translation
|
||||
multilingualContentService.addTranslation(this.createdNode, this.mlTranslation, I18NUtil.parseLocale(this.language));
|
||||
|
||||
// Get the content data of the translation
|
||||
ContentData contentData = fileFolderService.getReader(this.createdNode).getContentData();
|
||||
|
||||
Node createdNode = new Node(this.createdNode);
|
||||
|
||||
Map<String, Object> browseProp = createdNode.getProperties();
|
||||
browseProp.put("size", contentData.getSize());
|
||||
browseProp.put("mimetype", contentData.getMimetype());
|
||||
browseProp.put("cm:content", contentData);
|
||||
browseProp.put("fileType32", Utils.getFileTypeImage(createdNode.getName(), false));
|
||||
browseProp.put("url", DownloadContentServlet.generateDownloadURL(this.createdNode, createdNode.getName()));
|
||||
|
||||
this.browseBean.setDocument(createdNode);
|
||||
|
||||
return outcome;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getDefaultFinishOutcome()
|
||||
{
|
||||
return "showDocDetails";
|
||||
return "browse";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user