Skip to content

Commit

Permalink
LPS-81251 Removes unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
@ealonso @brianchandotcom
ealonso authored and brianchandotcom committed Jul 20, 2018
1 parent 37467d0 commit 761fa54
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 153 deletions.
27 changes: 0 additions & 27 deletions modules/apps/journal/journal-web/src/main/resources/META-INF/resources/article/content.jsp
View file
Expand Up @@ -32,20 +32,6 @@ DDMTemplate ddmTemplate = (DDMTemplate)request.getAttribute("edit_article.jsp-te
String defaultLanguageId = (String)request.getAttribute("edit_article.jsp-defaultLanguageId");
boolean changeStructure = GetterUtil.getBoolean(request.getAttribute("edit_article.jsp-changeStructure"));
long folderId = journalDisplayContext.getFolderId();
boolean searchRestriction = false;
if (journalDisplayContext.getRestrictionType() == JournalFolderConstants.RESTRICTION_TYPE_DDM_STRUCTURES_AND_WORKFLOW) {
searchRestriction = true;
}
if (!searchRestriction) {
folderId = JournalFolderLocalServiceUtil.getOverridedDDMStructuresFolderId(folderId);
searchRestriction = folderId != JournalFolderConstants.DEFAULT_PARENT_FOLDER_ID;
}
%>

<liferay-ui:error-marker
Expand Down Expand Up @@ -184,22 +170,9 @@ if (!searchRestriction) {
<aui:script use="liferay-journal-content">
new Liferay.Portlet.JournalContent(
{
'ddm.basePortletURL': '<%= PortletURLFactoryUtil.create(request, PortletProviderUtil.getPortletId(DDMStructure.class.getName(), PortletProvider.Action.VIEW), PortletRequest.RENDER_PHASE) %>',
'ddm.classNameId': '<%= PortalUtil.getClassNameId(DDMStructure.class) %>',
'ddm.classPK': <%= ddmStructure.getPrimaryKey() %>,
'ddm.groupId': <%= groupId %>,
'ddm.refererPortletName': '<%= JournalPortletKeys.JOURNAL + ".selectStructure" %>',
'ddm.resourceClassNameId': '<%= ddmStructure.getClassNameId() %>',
'ddm.searchRestriction': <%= searchRestriction %>,
'ddm.searchRestrictionClassNameId': <%= ClassNameLocalServiceUtil.getClassNameId(JournalFolder.class) %>,
'ddm.searchRestrictionClassPK': <%= folderId %>,
'ddm.templateId': <%= (ddmTemplate != null) ? ddmTemplate.getTemplateId() : 0 %>,
editStructure: '#<portlet:namespace />editDDMStructure',
editTemplate: '#<portlet:namespace />editDDMTemplate',
namespace: '<portlet:namespace />',
selectStructure: '#<portlet:namespace />selectStructure',
selectTemplate: '#<portlet:namespace />selectTemplate',
'strings.draft': '<liferay-ui:message key="draft" />',
'strings.editStructure': '<liferay-ui:message key="editing-the-current-structure-deletes-all-unsaved-content" />',
'strings.editTemplate': '<liferay-ui:message key="editing-the-current-template-deletes-all-unsaved-content" />',
'urls.editStructure': '<%= editStructureURL %>',
Expand Down
126 changes: 0 additions & 126 deletions modules/apps/journal/journal-web/src/main/resources/META-INF/resources/js/content.js
View file
Expand Up @@ -5,12 +5,6 @@ AUI.add(

var STR_CLICK = 'click';

var STR_DDM = 'ddm';

var STR_SELECT_STRUCTURE = 'selectStructure';

var STR_SELECT_TEMPLATE = 'selectTemplate';

var STR_STRINGS = 'strings';

var STR_URLS = 'urls';
Expand All @@ -20,11 +14,6 @@ AUI.add(
var JournalContent = A.Component.create(
{
ATTRS: {
ddm: {
validator: Lang.isObject,
value: {}
},

editStructure: {
setter: A.one
},
Expand All @@ -33,18 +22,9 @@ AUI.add(
setter: A.one
},

selectStructure: {
setter: A.one
},

selectTemplate: {
setter: A.one
},

strings: {
validator: Lang.isObject,
value: {
draft: Liferay.Language.get('draft'),
editStructure: Liferay.Language.get('editing-the-current-structure-deletes-all-unsaved-content'),
editTemplate: Liferay.Language.get('editing-the-current-template-deletes-all-unsaved-content'),
structures: Liferay.Language.get('structures'),
Expand Down Expand Up @@ -98,22 +78,6 @@ AUI.add(
);
}

var selectTemplate = instance.get(STR_SELECT_TEMPLATE);

if (selectTemplate) {
eventHandles.push(
selectTemplate.on(STR_CLICK, instance._openDDMTemplateSelector, instance)
);
}

var selectStructure = instance.get(STR_SELECT_STRUCTURE);

if (selectStructure) {
eventHandles.push(
selectStructure.on(STR_CLICK, instance._openDDMStructureSelector, instance)
);
}

instance._eventHandles = eventHandles;
},

Expand Down Expand Up @@ -153,96 +117,6 @@ AUI.add(
}
);
}
},

_getPrincipalForm: function(formName) {
var instance = this;

return instance.one('form[name=' + instance.ns(formName || 'fm1') + ']');
},

_openDDMStructureSelector: function() {
var instance = this;

var ddm = instance.get(STR_DDM);

var strings = instance.get(STR_STRINGS);

Liferay.Util.openDDMPortlet(
{
basePortletURL: ddm.basePortletURL,
classPK: ddm.classPK,
dialog: {
destroyOnHide: true
},
eventName: instance.ns(STR_SELECT_STRUCTURE),
groupId: ddm.groupId,
mvcPath: '/select_structure.jsp',
navigationStartsOn: 'SELECT_STRUCTURE',
refererPortletName: ddm.refererPortletName,
searchRestriction: ddm.searchRestriction,
searchRestrictionClassNameId: ddm.searchRestrictionClassNameId,
searchRestrictionClassPK: ddm.searchRestrictionClassPK,
showAncestorScopes: true,
showCacheableInput: true,
title: strings.structures
},
function(event) {
var form = instance._getPrincipalForm();

var ddmStructureId = instance.one('#ddmStructureId');

if (ddmStructureId.val() != event.ddmstructureid) {
ddmStructureId.val(event.ddmstructureid);

instance.one('#changeStructure').val(true);

instance.one('#ddmStructureKey').val(event.ddmstructurekey);

instance.one('#ddmTemplateKey').val('');

submitForm(form, null, false, false);
}
}
);
},

_openDDMTemplateSelector: function() {
var instance = this;

var ddm = instance.get(STR_DDM);

var strings = instance.get(STR_STRINGS);

Liferay.Util.openDDMPortlet(
{
basePortletURL: ddm.basePortletURL,
classNameId: ddm.classNameId,
classPK: ddm.classPK,
dialog: {
destroyOnHide: true
},
eventName: instance.ns(STR_SELECT_TEMPLATE),
groupId: ddm.groupId,
mvcPath: '/select_template.jsp',
navigationStartsOn: 'SELECT_TEMPLATE',
refererPortletName: ddm.refererPortletName,
resourceClassNameId: ddm.resourceClassNameId,
showAncestorScopes: true,
showCacheableInput: true,
templateId: ddm.templateId,
title: strings.templates
},
function(event) {
var form = instance._getPrincipalForm();

var ddmTemplateId = instance.one('#ddmTemplateId');

ddmTemplateId.val(event.ddmtemplateid);

submitForm(form, null, false, false);
}
);
}
}
}
Expand Down

0 comments on commit 761fa54

Please sign in to comment.