LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG/ccm-cms: AssetPane, creation of assets. 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4662 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2017-04-06 13:09:58 +00:00
parent dc1ec63e51
commit 6339c2bb08
15 changed files with 592 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-bundle-devel-wildfly-web/src/main/resources/log4j2.xml
View File

@ -22,7 +22,10 @@
<Logger name="org.hibernate.type.descriptor.sql"
level="trace">
</Logger>-->
<Logger name="com.arsdigita.cms.ui.assets.AssetFolderBrowserController"
level="debug">
</Logger>
<Logger name="com.arsdigita.cms.ui.folder.FolderBrowserTableModelBuilder"
level="debug">
</Logger>

35
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
View File

@ -26,6 +26,7 @@ import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.Paginator;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.Text;
import com.arsdigita.bebop.event.TableActionAdapter;
@ -64,7 +65,7 @@ public class AssetFolderBrowser extends Table {
protected final static String SORT_KEY_LAST_MODIFIED_DATE = "lastModified";
protected final static String SORT_KEY_CREATION_DATE = "creationDate";
private final FolderSelectionModel folderSelectionModel;
private final AssetPane assetPane;
private TableActionListener folderChanger;
private TableActionListener folderDeleter;
private TableColumn nameColumn;
@ -77,12 +78,12 @@ public class AssetFolderBrowser extends Table {
private Paginator paginator;
private long folderSize;
public AssetFolderBrowser(final FolderSelectionModel folderSelectionModel) {
public AssetFolderBrowser(final AssetPane assetPane) {
super();
sortTypeParameter.setDefaultValue(SORT_KEY_NAME);
sortDirectionParameter.setDefaultValue(SORT_ACTION_UP);
this.folderSelectionModel = folderSelectionModel;
this.assetPane = assetPane;
initComponents();
}
@ -111,7 +112,6 @@ public class AssetFolderBrowser extends Table {
nameColumn.setCellRenderer(new NameCellRenderer());
nameColumn.setHeaderRenderer(new HeaderCellRenderer(SORT_KEY_NAME));
getColumn(AssetFolderBrowserTableModel.COL_CREATION_DATE)
.setHeaderRenderer(
new HeaderCellRenderer(SORT_KEY_CREATION_DATE));
@ -142,14 +142,19 @@ public class AssetFolderBrowser extends Table {
super.register(page);
page.addComponentStateParam(this, folderSelectionModel.
getStateParameter());
page.addComponentStateParam(
this,
getFolderSelectionModel().getStateParameter());
page.addComponentStateParam(this, sortTypeParameter);
page.addComponentStateParam(this, sortDirectionParameter);
}
protected FolderSelectionModel getFolderSelectionModel() {
return folderSelectionModel;
return assetPane.getFolderSelectionModel();
}
protected SingleSelectionModel<Long> getSelectedAssetModel() {
return assetPane.getSelectedAssetModel();
}
protected Paginator getPaginator() {
@ -288,13 +293,14 @@ public class AssetFolderBrowser extends Table {
row,
column);
} else {
return new ControlLink(new Text(name));
// return new Link(new Text(name),
// itemResolver.generateItemURL(state,
// objectId,
// name,
// section,
// "DRAFT"));
return new Text(name);
}
}
@ -387,9 +393,16 @@ public class AssetFolderBrowser extends Table {
}
clearSelection(state);
getFolderSelectionModel().setSelectedKey(
state,
getObjectId(event.getRowKey()));
final String rowKey = (String) event.getRowKey();
if (rowKey.startsWith(CmsConstants.FOLDER_BROWSER_KEY_PREFIX_FOLDER)) {
getFolderSelectionModel().setSelectedKey(state,
getObjectId(rowKey));
} else if (rowKey.startsWith(
CmsConstants.FOLDER_BROWSER_KEY_PREFIX_ASSET)) {
getSelectedAssetModel().setSelectedKey(state,
getObjectId(rowKey));
assetPane.editAssetMode(state);
}
}
}

32
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserController.java
View File

@ -58,6 +58,8 @@ import org.librecms.contentsection.FolderRepository;
import java.util.Collections;
import java.util.Optional;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import static org.librecms.CmsConstants.*;
@ -68,6 +70,9 @@ import static org.librecms.CmsConstants.*;
@RequestScoped
public class AssetFolderBrowserController {
private static final Logger LOGGER = LogManager
.getLogger(AssetFolderBrowserController.class);
@Inject
private EntityManager entityManager;
@ -217,7 +222,7 @@ public class AssetFolderBrowserController {
} else if (objectId.startsWith(FOLDER_BROWSER_KEY_PREFIX_ASSET)) {
copyAsset(targetFolder,
Long.parseLong(objectId.substring(
FOLDER_BROWSER_KEY_PREFIX_ITEM.length())));
FOLDER_BROWSER_KEY_PREFIX_ASSET.length())));
} else {
throw new IllegalArgumentException(String.format(
"ID '%s' does not start with '%s' or '%s'.",
@ -440,7 +445,7 @@ public class AssetFolderBrowserController {
.ifPresent(assetRepo::delete);
} else {
throw new IllegalArgumentException(
"The objectId is expected to start with 'folder-' or 'item.'.");
"The objectId is expected to start with 'folder-' or 'asset-'.");
}
}
@ -517,9 +522,11 @@ public class AssetFolderBrowserController {
.createQuery(
criteria.where(
builder.and(
builder.equal(from.get("parentCategory"),
builder.
equal(from.get("parentCategory"),
folder),
builder.like(builder.lower(from.get("name")),
builder.like(builder.lower(from.get(
"name")),
filterTerm)
)
)
@ -573,6 +580,20 @@ public class AssetFolderBrowserController {
order = builder.asc(orderPath);
}
LOGGER.debug("The database contains {} assets.",
entityManager.createQuery(criteria.select(fromAsset)
.where(
builder.and(
builder.equal(join.get("category"),
folder),
builder.equal(join.get("type"),
CmsConstants.CATEGORIZATION_TYPE_FOLDER),
builder.like(builder.lower(
fromAsset.get(
"displayName")),
filterTerm)
))).getResultList().size());
final TypedQuery<Asset> query = entityManager
.createQuery(
criteria.select(fromAsset)
@ -582,7 +603,8 @@ public class AssetFolderBrowserController {
"category"), folder),
builder.equal(join.get("type"),
CmsConstants.CATEGORIZATION_TYPE_FOLDER),
builder.like(builder.lower(fromAsset.get(
builder.like(builder.lower(
fromAsset.get(
"displayName")),
filterTerm)
)

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModel.java
View File

@ -96,7 +96,7 @@ class AssetFolderBrowserTableModel implements TableModel {
if (currentRow.isFolder()) {
return String.format("folder-%d", currentRow.getObjectId());
} else {
return String.format("item-%d", currentRow.getObjectId());
return String.format("asset-%d", currentRow.getObjectId());
}
// return currentRow.getObjectId();

6
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModelBuilder.java
View File

@ -50,9 +50,9 @@ class AssetFolderBrowserTableModelBuilder
final PageState state) {
if (!(table instanceof AssetFolderBrowser)) {
throw new IllegalArgumentException("The "
+ "AssetFolderBrowserTableModelBuilder can only be used for the "
+ "AssetFolderBrowser.");
throw new IllegalArgumentException(
"The AssetFolderBrowserTableModelBuilder can only be used "
+ "for the AssetFolderBrowser.");
}
final AssetFolderBrowser assetFolderBrowser = (AssetFolderBrowser) table;

29
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetForm.java
View File

@ -39,6 +39,9 @@ import org.librecms.contentsection.Asset;
import org.librecms.contentsection.AssetRepository;
import java.util.Optional;
import org.libreccm.categorization.CategoryManager;
import org.librecms.contentsection.Folder;
import org.librecms.contentsection.FolderManager;
/**
*
@ -75,6 +78,10 @@ public abstract class AssetForm extends Form implements FormInitListener,
saveCancelSection = new SaveCancelSection();
add(saveCancelSection);
addInitListener(this);
addProcessListener(this);
addSubmissionListener(this);
}
protected void addWidgets() {
@ -95,7 +102,8 @@ public abstract class AssetForm extends Form implements FormInitListener,
AssetRepository.class);
final Asset asset = assetRepo
.findById(selectionModel.getSelectedKey(state))
.orElseThrow(() -> new IllegalArgumentException(String.format(
.orElseThrow(() -> new IllegalArgumentException(String.
format(
"No asset with ID %d in the database.",
selectionModel.getSelectedKey(state))));
return Optional.of(asset);
@ -145,6 +153,25 @@ public abstract class AssetForm extends Form implements FormInitListener,
final AssetRepository assetRepo = cdiUtil
.findBean(AssetRepository.class);
assetRepo.save(asset);
if (!selectedAsset.isPresent()) {
//Set display name
asset.setDisplayName((String) title.getValue(state));
assetRepo.save(asset);
//Add new asset to currently selected folder
final Folder selectedFolder = assetPane
.getFolderSelectionModel()
.getSelectedObject(state);
final CategoryManager categoryManager = cdiUtil
.findBean(CategoryManager.class);
categoryManager.addObjectToCategory(
asset,
selectedFolder,
CmsConstants.CATEGORIZATION_TYPE_FOLDER);
}
assetPane.browseMode(state);
}
}

112
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetPane.java
View File

@ -26,6 +26,7 @@ import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.MetaForm;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.Paginator;
@ -69,6 +70,7 @@ import com.arsdigita.cms.ui.folder.FolderTreeModelController;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.toolbox.ui.ActionGroup;
import com.arsdigita.toolbox.ui.LayoutPanel;
import java.lang.reflect.InvocationTargetException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -98,6 +100,7 @@ import java.util.Arrays;
import java.util.Objects;
import java.util.ResourceBundle;
import java.util.TooManyListenersException;
import java.util.logging.Level;
import static org.librecms.CmsConstants.*;
@ -124,6 +127,8 @@ public class AssetPane extends LayoutPanel implements Resettable {
new StringParameter(SOURCES_PARAM));
private final StringParameter actionParameter = new StringParameter(
ACTION_PARAM);
private final StringParameter selectedAssetTypeParam = new StringParameter(
"selected_asset_type");
private AssetFolderBrowser folderBrowser;
private Form browserForm;
@ -136,7 +141,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
private SegmentedPanel.Segment actionsSegment;
private SegmentedPanel.Segment newFolderSegment;
private SegmentedPanel.Segment editFolderSegment;
private SegmentedPanel.Segment editAssetSegement;
private SegmentedPanel.Segment editAssetSegment;
@SuppressWarnings("unchecked")
public AssetPane() {
@ -189,7 +194,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
browserForm = new Form("assetFolderBrowser",
new BoxPanel(BoxPanel.VERTICAL));
browserForm.setMethod(Form.GET);
folderBrowser = new AssetFolderBrowser(folderSelectionModel);
folderBrowser = new AssetFolderBrowser(this);
final Paginator paginator = new Paginator(
new AssetFolderBrowserPaginationModelBuilder(folderBrowser),
CMSConfig.getConfig().getFolderBrowseListSize());
@ -453,7 +458,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
newAssetForm.add(new Label(new GlobalizedMessage(
"cms.ui.assets.new", CmsConstants.CMS_BUNDLE)));
final SingleSelect newAssetTypeSelect = new SingleSelect(
"new-asset-type-select");
selectedAssetTypeParam);
try {
newAssetTypeSelect.addPrintListener(new PrintListener() {
@ -463,6 +468,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
final AssetTypesManager typesManager = cdiUtil
.findBean(AssetTypesManager.class);
final SingleSelect target = (SingleSelect) event.getTarget();
target.clearOptions();
for (final AssetTypeInfo type : typesManager
.getAvailableAssetTypes()) {
final String labelKey = type.getLabelKey();
@ -488,14 +494,88 @@ public class AssetPane extends LayoutPanel implements Resettable {
@Override
public void process(final FormSectionEvent event)
throws FormProcessException {
//Nothing yet
editAssetMode(event.getPageState());
}
});
actionsSegment.add(newAssetForm);
final MetaForm editAssetForm = new MetaForm(MOVE) {
@Override
public Form buildForm(final PageState state) {
final boolean newAsset;
final Long selectedAssetId = selectedAssetModel
.getSelectedKey(state);
newAsset = selectedAssetId == null;
final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
final String selectedAssetType;
if (newAsset) {
selectedAssetType = (String) newAssetTypeSelect
.getValue(state);
} else {
final AssetRepository assetRepo = cdiUtil
.findBean(AssetRepository.class);
final Asset asset = assetRepo.findById(selectedAssetModel
.getSelectedKey(state))
.orElseThrow(() -> new IllegalArgumentException(
String.format("No asset with ID %d in the "
+ "database.",
selectedAssetModel
.getSelectedKey(state))));
selectedAssetType = asset.getClass().getName();
}
final AssetTypesManager typesManager = cdiUtil
.findBean(AssetTypesManager.class);
final AssetTypeInfo typeInfo = typesManager
.getAssetTypeInfo(selectedAssetType);
final Class<? extends AssetForm> assetForm = typeInfo
.getAssetForm();
try {
return assetForm
.getConstructor(AssetPane.class)
.newInstance(AssetPane.this);
} catch (NoSuchMethodException
| SecurityException
| InstantiationException
| IllegalAccessException
| InvocationTargetException ex) {
throw new UnexpectedErrorException(String.format(
"Failed to create form '%s' for editing assets "
+ "of type '%s'.",
assetForm.getName(),
selectedAssetType));
}
}
};
editAssetSegment = panel.addSegment();
editAssetSegment.addHeader(
new Label(new PrintListener() {
@Override
public void prepare(final PrintEvent event) {
final PageState state = event.getPageState();
final Label target = (Label) event.getTarget();
if (selectedAssetModel.isSelected(state)) {
target.setLabel(new GlobalizedMessage(
"cms.ui.admin.assets.edit",
CmsConstants.CMS_BUNDLE));
} else {
target.setLabel(new GlobalizedMessage(
"cms.ui.admin.assets.create",
CmsConstants.CMS_BUNDLE));
}
}
}));
editAssetSegment.add(editAssetForm);
return panel;
}
@ -509,6 +589,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
actionsSegment.setVisible(state, true);
newFolderSegment.setVisible(state, false);
editFolderSegment.setVisible(state, false);
editAssetSegment.setVisible(state, false);
}
@ -522,6 +603,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
newFolderSegment.setVisible(state, false);
editFolderSegment.setVisible(state, false);
targetSelector.expose(state);
editAssetSegment.setVisible(state, false);
}
protected void newFolderMode(final PageState state) {
@ -533,6 +615,7 @@ public class AssetPane extends LayoutPanel implements Resettable {
actionsSegment.setVisible(state, false);
newFolderSegment.setVisible(state, true);
editFolderSegment.setVisible(state, false);
editAssetSegment.setVisible(state, false);
}
protected void editFolderMode(final PageState state) {
@ -542,6 +625,17 @@ public class AssetPane extends LayoutPanel implements Resettable {
actionsSegment.setVisible(state, false);
newFolderSegment.setVisible(state, false);
editFolderSegment.setVisible(state, true);
editAssetSegment.setVisible(state, false);
}
protected void editAssetMode(final PageState state) {
tree.setVisible(state, false);
browseSegment.setVisible(state, false);
targetSelector.setVisible(state, false);
actionsSegment.setVisible(state, false);
newFolderSegment.setVisible(state, false);
editFolderSegment.setVisible(state, false);
editAssetSegment.setVisible(state, true);
}
@Override
@ -560,9 +654,13 @@ public class AssetPane extends LayoutPanel implements Resettable {
page.setVisibleDefault(actionsSegment, true);
page.setVisibleDefault(newFolderSegment, false);
page.setVisibleDefault(editFolderSegment, false);
page.setVisibleDefault(editAssetSegment, false);
page.addComponentStateParam(this, actionParameter);
page.addComponentStateParam(this, sourcesParameter);
page.addComponentStateParam(this, selectedAssetTypeParam);
page.addComponentStateParam(this,
selectedAssetModel.getStateParameter());
}
@Override
@ -581,6 +679,10 @@ public class AssetPane extends LayoutPanel implements Resettable {
return selectedAssetModel;
}
protected FolderSelectionModel getFolderSelectionModel() {
return folderSelectionModel;
}
private String[] getSources(final PageState state) {
final String[] result = (String[]) state.getValue(sourcesParameter);

19
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/BookmarkForm.java
View File

@ -38,8 +38,6 @@ import org.librecms.contentsection.Asset;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Objects;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
@ -103,13 +101,7 @@ public class BookmarkForm extends AssetForm {
.addValue(KernelConfig.getConfig().getDefaultLocale(),
(String) description.getValue(state));
try {
bookmark.setUrl(new URL((String) url.getValue(state)));
} catch (MalformedURLException ex) {
throw new FormProcessException(new GlobalizedMessage(
"cms.ui.assets.bookmark.url.malformed",
CmsConstants.CMS_BUNDLE));
}
bookmark.setUrl((String) url.getValue(state));
return bookmark;
}
@ -136,14 +128,7 @@ public class BookmarkForm extends AssetForm {
.addValue(KernelConfig.getConfig().getDefaultLocale(),
(String) description.getValue(state));
try {
bookmark.setUrl(new URL((String) url.getValue(state)));
} catch (MalformedURLException ex) {
throw new FormProcessException(new GlobalizedMessage(
"cms.ui.assets.bookmark.url.malformed",
CmsConstants.CMS_BUNDLE));
}
bookmark.setUrl((String) url.getValue(state));
}
}

11
ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/LegalMetadataForm.java
View File

@ -51,19 +51,28 @@ public class LegalMetadataForm extends AssetForm {
@Override
protected void addWidgets() {
add(new Label(new GlobalizedMessage(
"cms.ui.assets.legalmetadata.rightsholder",
CmsConstants.CMS_BUNDLE)));
rightsHolder = new TextArea("legalmetadata-rightsholder");
add(rightsHolder);
add(new Label(new GlobalizedMessage(
"cms.ui.assets.legalmetadata.rights",
CmsConstants.CMS_BUNDLE)));
rights = new TextArea("legalmetadata-rights");
add(rights);
add(new Label(new GlobalizedMessage(
"cms.ui.assets.legalmetadata.publisher",
CmsConstants.CMS_BUNDLE)));
publisher = new TextArea("legalmetadata-rights");
add(publisher);
add(new Label(new GlobalizedMessage(
"cms.ui.assets.legalmetadata.creator",
CmsConstants.CMS_BUNDLE)));
creator = new TextArea("legalmetadata-creator");
add(creator);
}

5
ccm-cms/src/main/java/org/librecms/assets/AssetTypesManager.java
View File

@ -173,8 +173,7 @@ public class AssetTypesManager {
* @return A {@link AssetTypeInfo} object describing the asset type.
*
* @throws IllegalArgumentException If no class with the provided name
* exists or the class is not a subclass of
* {@link Asset}.
* exists or the class is not a subclass of {@link Asset}.
*/
@SuppressWarnings("unchecked")
public AssetTypeInfo getAssetTypeInfo(final String assetTypeClass) {
@ -186,7 +185,7 @@ public class AssetTypesManager {
clazz = Class.forName(assetTypeClass);
} catch (ClassNotFoundException ex) {
throw new IllegalArgumentException(String.format(
"There is not class \"%s\".", assetTypeClass),
"There is no class \"%s\".", assetTypeClass),
ex);
}

6
ccm-cms/src/main/java/org/librecms/assets/Bookmark.java
View File

@ -73,7 +73,7 @@ public class Bookmark extends Asset implements Serializable {
@Column(name = "URL", length = 2048, nullable = false)
@NotEmpty
private URL url;
private String url;
public Bookmark() {
super();
@ -88,11 +88,11 @@ public class Bookmark extends Asset implements Serializable {
this.description = description;
}
public URL getUrl() {
public String getUrl() {
return url;
}
public void setUrl(final URL url) {
public void setUrl(final String url) {
this.url = url;
}

1
ccm-cms/src/main/java/org/librecms/contentsection/AssetRepository.java
View File

@ -98,6 +98,7 @@ public class AssetRepository
@RequiresPrivilege(AssetPrivileges.EDIT)
final Asset asset) {
super.save(asset);
}
/**

4
ccm-cms/src/main/resources/org/librecms/CmsResources.properties
View File

@ -248,3 +248,7 @@ cms.ui.assets=Assets
cms.ui.folder.no_assets=No assets
cms.ui.assets.new=Create new asset
cms.ui.assets.new.create=Create asset
cms.ui.asset.title=Title
cms.ui.admin.assets.create=Create new asset
cms.ui.assets.bookmark.description=Description
cms.ui.assets.bookmark.url=URL

4
ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
View File

@ -247,3 +247,7 @@ cms.ui.assets=Medien & Daten
cms.ui.folder.no_assets=Keine Medien oder Datens\u00e4tze vorhanden
cms.ui.assets.new=Neues Asset anlegen
cms.ui.assets.new.create=Asset anlegen
cms.ui.asset.title=Titel
cms.ui.admin.assets.create=Neues Asset anlegen
cms.ui.assets.bookmark.description=Beschreibung
cms.ui.assets.bookmark.url=URL

4
ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
View File

@ -206,3 +206,7 @@ cms.ui.assets=Assets
cms.ui.folder.no_assets=No assets
cms.ui.assets.new=Create new asset
cms.ui.assets.new.create=Create asset
cms.ui.asset.title=Title
cms.ui.admin.assets.create=Create new asset
cms.ui.assets.bookmark.description=Description
cms.ui.assets.bookmark.url=URL