From 86008898727a2e3910e1c063b6fec166b0bc7a6c Mon Sep 17 00:00:00 2001 From: Alberto Gallardo Date: Mon, 9 Mar 2015 15:46:02 +0100 Subject: [PATCH 1/2] Apply opencms-core src changes Delete default group "Projectmanagers" --- .../newsletter/admin/CmsEditMailinglistDialog.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/com.alkacon.opencms.newsletter/src/com/alkacon/opencms/newsletter/admin/CmsEditMailinglistDialog.java b/com.alkacon.opencms.newsletter/src/com/alkacon/opencms/newsletter/admin/CmsEditMailinglistDialog.java index 42e5ed12..7bbc4a44 100644 --- a/com.alkacon.opencms.newsletter/src/com/alkacon/opencms/newsletter/admin/CmsEditMailinglistDialog.java +++ b/com.alkacon.opencms.newsletter/src/com/alkacon/opencms/newsletter/admin/CmsEditMailinglistDialog.java @@ -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(); @@ -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); @@ -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 @@ -140,6 +141,7 @@ protected void defineWidgets() { /** * @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListClass() */ + @Override protected String getListClass() { return CmsMailinglistsList.class.getName(); @@ -148,6 +150,7 @@ protected String getListClass() { /** * @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListRootPath() */ + @Override protected String getListRootPath() { return "/newsletter/orgunit/mailinglists"; @@ -156,6 +159,7 @@ protected String getListRootPath() { /** * @see org.opencms.workplace.CmsWorkplace#initMessages() */ + @Override protected void initMessages() { // add specific dialog resource bundle @@ -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; @@ -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(); From 0818d8a972a32995855935b48bcdf5afbbaebd68 Mon Sep 17 00:00:00 2001 From: Alberto Gallardo Date: Mon, 9 Mar 2015 16:42:51 +0100 Subject: [PATCH 2/2] Apply opencms-core src changes in v8 Delete default group "Projectmanagers" --- .../v8/newsletter/admin/CmsEditMailinglistDialog.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/com.alkacon.opencms.v8.newsletter/src/com/alkacon/opencms/v8/newsletter/admin/CmsEditMailinglistDialog.java b/com.alkacon.opencms.v8.newsletter/src/com/alkacon/opencms/v8/newsletter/admin/CmsEditMailinglistDialog.java index f376bb8c..1a93429a 100644 --- a/com.alkacon.opencms.v8.newsletter/src/com/alkacon/opencms/v8/newsletter/admin/CmsEditMailinglistDialog.java +++ b/com.alkacon.opencms.v8.newsletter/src/com/alkacon/opencms/v8/newsletter/admin/CmsEditMailinglistDialog.java @@ -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(); @@ -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); @@ -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 @@ -140,6 +141,7 @@ protected void defineWidgets() { /** * @see org.opencms.workplace.tools.accounts.A_CmsEditGroupDialog#getListClass() */ + @Override protected String getListClass() { return CmsMailinglistsList.class.getName(); @@ -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"; @@ -156,6 +159,7 @@ protected String getListRootPath() { /** * @see org.opencms.workplace.CmsWorkplace#initMessages() */ + @Override protected void initMessages() { // add specific dialog resource bundle @@ -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; @@ -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();