- Changed the default of the config options
com.arsdigita.cms.allow_content_create_in_section_listing and com.arsdigita.cms.delete_workflow_after_publication from
true to false. In our bundles they are set to false since a long time.
git-svn-id: https://svn.libreccm.org/ccm/trunk@2955 8810af33-2d31-482b-a856-94f89814c4df
master
parent
c4e40a3a5c
commit
86236f5e5b
|
|
@ -264,12 +264,18 @@ public final class CMSConfig extends AbstractConfig {
|
||||||
Parameter.REQUIRED,
|
Parameter.REQUIRED,
|
||||||
Boolean.FALSE);
|
Boolean.FALSE);
|
||||||
/**
|
/**
|
||||||
* Whether an item's workflow should be deleted, once the item has been (re)published
|
* Whether an item's workflow should be deleted, once the item has been (re)published.
|
||||||
|
*
|
||||||
|
* jensp 2014-11-07: Default changed from true to false. Deleting the assigned workflow means
|
||||||
|
* that the authors have to reattach a workflow using the Workflow tab, which is complicated
|
||||||
|
* (for some users too complicated). Also deleting the workflow means that the new convenient
|
||||||
|
* link to restart a workflow will not work.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
private final Parameter m_deleteWorkflowAfterPublication = new BooleanParameter(
|
private final Parameter m_deleteWorkflowAfterPublication = new BooleanParameter(
|
||||||
"com.arsdigita.cms.delete_workflow_after_publication",
|
"com.arsdigita.cms.delete_workflow_after_publication",
|
||||||
Parameter.REQUIRED,
|
Parameter.REQUIRED,
|
||||||
Boolean.TRUE);
|
Boolean.FALSE);
|
||||||
/**
|
/**
|
||||||
* Defines the number of days ahead that are covered in the 'Soon Expired' tab
|
* Defines the number of days ahead that are covered in the 'Soon Expired' tab
|
||||||
*/
|
*/
|
||||||
|
|
@ -400,12 +406,16 @@ public final class CMSConfig extends AbstractConfig {
|
||||||
Boolean.FALSE);
|
Boolean.FALSE);
|
||||||
/**
|
/**
|
||||||
* Allow content creation in Workspace (content center) section listing. Allows you to turn off
|
* Allow content creation in Workspace (content center) section listing. Allows you to turn off
|
||||||
* the ability to create content in the section listing
|
* the ability to create content in the section listing.
|
||||||
|
*
|
||||||
|
* jensp 2014-11-07: Default changed to false. This feature isn't used by most users. Also
|
||||||
|
* it has some drawbacks, for example items creating using this way are put into the root
|
||||||
|
* folder.
|
||||||
*/
|
*/
|
||||||
private final Parameter m_allowContentCreateInSectionListing = new BooleanParameter(
|
private final Parameter m_allowContentCreateInSectionListing = new BooleanParameter(
|
||||||
"com.arsdigita.cms.allow_content_create_in_section_listing",
|
"com.arsdigita.cms.allow_content_create_in_section_listing",
|
||||||
Parameter.REQUIRED,
|
Parameter.REQUIRED,
|
||||||
Boolean.TRUE);
|
Boolean.FALSE);
|
||||||
/**
|
/**
|
||||||
* Hide the legacy public site link in Workspace (content center) section listing. Legacy public
|
* Hide the legacy public site link in Workspace (content center) section listing. Legacy public
|
||||||
* site display is replaced by navigation based presentation (or by portlets) and should be
|
* site display is replaced by navigation based presentation (or by portlets) and should be
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,7 @@ public class GenericPersonContactAddForm extends BasicItemForm {
|
||||||
this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
|
this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
|
||||||
findByAssociatedObjectType(
|
findByAssociatedObjectType(
|
||||||
"com.arsdigita.cms.contenttypes.GenericContact"));
|
"com.arsdigita.cms.contenttypes.GenericContact"));
|
||||||
|
this.m_itemSearch.setEditAfterCreate(true);
|
||||||
add(this.m_itemSearch);
|
add(this.m_itemSearch);
|
||||||
|
|
||||||
// GenericContact type field
|
// GenericContact type field
|
||||||
|
|
|
||||||
|
|
@ -349,10 +349,14 @@ public class ItemSearchFolderBrowser extends Table {
|
||||||
boolean useURL = "true".equals(state.getValue(new StringParameter(
|
boolean useURL = "true".equals(state.getValue(new StringParameter(
|
||||||
ItemSearchPopup.URL_PARAM)));
|
ItemSearchPopup.URL_PARAM)));
|
||||||
|
|
||||||
String fillString = useURL
|
String fillString;
|
||||||
? ItemSearchPopup.getItemURL(
|
if (useURL) {
|
||||||
state.getRequest(),
|
fillString = ItemSearchPopup.getItemURL(state.getRequest(),
|
||||||
coll.getDomainObject().getOID()) : id + " (" + name + ")";
|
coll.getDomainObject().getOID());
|
||||||
|
} else {
|
||||||
|
fillString = id.toString();// + " (" + name + ")";
|
||||||
|
}
|
||||||
|
|
||||||
String title = ((ContentPage) coll.getDomainObject()).getTitle();
|
String title = ((ContentPage) coll.getDomainObject()).getTitle();
|
||||||
|
|
||||||
Label js = new Label(
|
Label js = new Label(
|
||||||
|
|
|
||||||
|
|
@ -126,9 +126,13 @@ public class ItemSearchPopup extends ItemSearch {
|
||||||
|
|
||||||
boolean useURL = "true".equals(state.getValue(new StringParameter(URL_PARAM)));
|
boolean useURL = "true".equals(state.getValue(new StringParameter(URL_PARAM)));
|
||||||
|
|
||||||
String fillString = useURL
|
String fillString;
|
||||||
? getItemURL(state.getRequest(), doc.getOID())
|
if (useURL) {
|
||||||
: doc.getOID().get("id").toString();
|
fillString = getItemURL(state.getRequest(), doc.getOID());
|
||||||
|
} else {
|
||||||
|
fillString = doc.getOID().get("id").toString();
|
||||||
|
}
|
||||||
|
|
||||||
String title = doc.getTitle();
|
String title = doc.getTitle();
|
||||||
|
|
||||||
Element jsLabel = Search.newElement("jsAction");
|
Element jsLabel = Search.newElement("jsAction");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue