Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply opencms-core src changes #39

Open
wants to merge 2 commits into
base: branch_9_5_x
Choose a base branch
from
Open

Apply opencms-core src changes #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8600889
Apply opencms-core src changes
gallardo Mar 9, 2015
0818d8a
Apply opencms-core src changes in v8
gallardo Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...opencms.newsletter/src/com/alkacon/opencms/newsletter/admin/CmsEditMailinglistDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ public CmsEditMailinglistDialog(PageContext context, HttpServletRequest req, Htt
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#actionCommit()
*/
@Override
public void actionCommit() {

m_group.setProjectCoWorker(false);
m_group.setProjectManager(false);
m_group.setEnabled(true);
setParentGroup("");
super.actionCommit();
Expand All @@ -97,6 +96,7 @@ public void actionCommit() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#createDialogHtml(java.lang.String)
*/
@Override
protected String createDialogHtml(String dialog) {

StringBuffer result = new StringBuffer(1024);
Expand All @@ -121,6 +121,7 @@ protected String createDialogHtml(String dialog) {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#defineWidgets()
*/
@Override
protected void defineWidgets() {

// initialize the user object to use for the dialog
Expand All @@ -140,6 +141,7 @@ protected void defineWidgets() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListClass()
*/
@Override
protected String getListClass() {

return CmsMailinglistsList.class.getName();
Expand All @@ -148,6 +150,7 @@ protected String getListClass() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListRootPath()
*/
@Override
protected String getListRootPath() {

return "/newsletter/orgunit/mailinglists";
Expand All @@ -156,6 +159,7 @@ protected String getListRootPath() {
/**
* @see org.opencms.workplace.CmsWorkplace#initMessages()
*/
@Override
protected void initMessages() {

// add specific dialog resource bundle
Expand All @@ -167,6 +171,7 @@ protected void initMessages() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#isEditable(CmsGroup)
*/
@Override
protected boolean isEditable(CmsGroup group) {

return true;
Expand All @@ -175,6 +180,7 @@ protected boolean isEditable(CmsGroup group) {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#validateParamaters()
*/
@Override
protected void validateParamaters() throws Exception {

super.validateParamaters();
Expand Down
10 changes: 8 additions & 2 deletions ...s.v8.newsletter/src/com/alkacon/opencms/v8/newsletter/admin/CmsEditMailinglistDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ public CmsEditMailinglistDialog(PageContext context, HttpServletRequest req, Htt
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#actionCommit()
*/
@Override
public void actionCommit() {

m_group.setProjectCoWorker(false);
m_group.setProjectManager(false);
m_group.setEnabled(true);
setParentGroup("");
super.actionCommit();
Expand All @@ -97,6 +96,7 @@ public void actionCommit() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#createDialogHtml(java.lang.String)
*/
@Override
protected String createDialogHtml(String dialog) {

StringBuffer result = new StringBuffer(1024);
Expand All @@ -121,6 +121,7 @@ protected String createDialogHtml(String dialog) {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#defineWidgets()
*/
@Override
protected void defineWidgets() {

// initialize the user object to use for the dialog
Expand All @@ -140,6 +141,7 @@ protected void defineWidgets() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListClass()
*/
@Override
protected String getListClass() {

return CmsMailinglistsList.class.getName();
Expand All @@ -148,6 +150,7 @@ protected String getListClass() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListRootPath()
*/
@Override
protected String getListRootPath() {

return "/v8-newsletter/orgunit/mailinglists";
Expand All @@ -156,6 +159,7 @@ protected String getListRootPath() {
/**
* @see org.opencms.workplace.CmsWorkplace#initMessages()
*/
@Override
protected void initMessages() {

// add specific dialog resource bundle
Expand All @@ -167,6 +171,7 @@ protected void initMessages() {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#isEditable(CmsGroup)
*/
@Override
protected boolean isEditable(CmsGroup group) {

return true;
Expand All @@ -175,6 +180,7 @@ protected boolean isEditable(CmsGroup group) {
/**
* @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#validateParamaters()
*/
@Override
protected void validateParamaters() throws Exception {

super.validateParamaters();
Expand Down