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

CCM NG/ccm-cms: ReportPane in ContentSectionPage enabled 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4522 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2017-01-17 09:54:58 +00:00
parent c762774d81
commit 2a54e8080f
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java
View File

@ -115,7 +115,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
*/ */
public static final int CONTENTTYPES_TAB = 6; public static final int CONTENTTYPES_TAB = 6;
public static final int USER_ADMIN_TAB = 7; public static final int USER_ADMIN_TAB = 7;
private TabbedPane m_tabbedPane; private TabbedPane m_tabbedPane;
private FolderAdminPane m_folderPane; private FolderAdminPane m_folderPane;
//ToDo NG private BrowsePane m_browsePane; //ToDo NG private BrowsePane m_browsePane;
@ -128,7 +128,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
private ContentTypeAdminPane m_typePane; private ContentTypeAdminPane m_typePane;
//private LayoutPanel m_userAdminPane; //private LayoutPanel m_userAdminPane;
private LayoutPanel m_csePane; private LayoutPanel m_csePane;
//ToDo NG private ReportPane m_reportPane; private ReportPane m_reportPane;
/** /**
* Creates the content section index page containing - a Navigaton bar for * Creates the content section index page containing - a Navigaton bar for
@ -157,7 +157,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// folder) which moved to the FolderAdminPane // folder) which moved to the FolderAdminPane
//m_userAdminPane = getUserAdminPane(); //m_userAdminPane = getUserAdminPane();
m_csePane = getCSEPane(); m_csePane = getCSEPane();
//ToDo NG m_reportPane = getReportPane(); m_reportPane = getReportPane();
// The panes // The panes
m_tabbedPane = createTabbedPane(); m_tabbedPane = createTabbedPane();
@ -179,29 +179,29 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
} }
final PermissionChecker permissionChecker = CdiUtil final PermissionChecker permissionChecker = CdiUtil
.createCdiUtil().findBean(PermissionChecker.class); .createCdiUtil().findBean(PermissionChecker.class);
if (CMSConfig.getConfig().isHideAdminTabs()) { if (CMSConfig.getConfig().isHideAdminTabs()) {
m_tabbedPane.setTabVisible( m_tabbedPane.setTabVisible(
state, state,
m_workflowPane, m_workflowPane,
permissionChecker.isPermitted( permissionChecker.isPermitted(
AdminPrivileges.ADMINISTER_WORKFLOW)); AdminPrivileges.ADMINISTER_WORKFLOW));
//ToDo NG //ToDo NG
// m_tabbedPane.setTabVisible( // m_tabbedPane.setTabVisible(
// state, m_categoryPane, // state, m_categoryPane,
// permissionChecker.isPermitted( // permissionChecker.isPermitted(
// AdminPrivileges.ADMINISTER_CATEGORIES)); // AdminPrivileges.ADMINISTER_CATEGORIES));
m_tabbedPane.setTabVisible( m_tabbedPane.setTabVisible(
state, state,
m_lifecyclePane, m_lifecyclePane,
permissionChecker.isPermitted( permissionChecker.isPermitted(
AdminPrivileges.ADMINISTER_LIFECYLES)); AdminPrivileges.ADMINISTER_LIFECYLES));
m_tabbedPane.setTabVisible( m_tabbedPane.setTabVisible(
state, state,
m_typePane, m_typePane,
permissionChecker.isPermitted( permissionChecker.isPermitted(
AdminPrivileges.ADMINISTER_CONTENT_TYPES)); AdminPrivileges.ADMINISTER_CONTENT_TYPES));
//ToDo NG //ToDo NG
//m_tabbedPane.setTabVisible( //m_tabbedPane.setTabVisible(
// state, // state,
@ -220,7 +220,8 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
/** /**
* Creates, and then caches, the browse pane. Overriding this method to * Creates, and then caches, the browse pane. Overriding this method to
* return null will prevent this tab from appearing. * return null will prevent this tab from appearing.
* @return *
* @return
*/ */
protected FolderAdminPane getFolderAdminPane() { protected FolderAdminPane getFolderAdminPane() {
if (m_folderPane == null) { if (m_folderPane == null) {
@ -242,11 +243,11 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// } // }
// return m_browsePane; // return m_browsePane;
// } // }
/** /**
* Creates, and then caches, the search pane. Overriding this method to * Creates, and then caches, the search pane. Overriding this method to
* return null will prevent this tab from appearing. * return null will prevent this tab from appearing.
* @return *
* @return
*/ */
// ToDo NG // ToDo NG
// protected ItemSearch getSearchPane() { // protected ItemSearch getSearchPane() {
@ -258,7 +259,6 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// } // }
// return m_searchPane; // return m_searchPane;
// } // }
// ToDo NG // ToDo NG
// protected ImagesPane getImagesPane() { // protected ImagesPane getImagesPane() {
// if (m_imagesPane == null) { // if (m_imagesPane == null) {
@ -266,7 +266,6 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// } // }
// return m_imagesPane; // return m_imagesPane;
// } // }
// ToDo NG // ToDo NG
// protected RoleAdminPane getRoleAdminPane() { // protected RoleAdminPane getRoleAdminPane() {
// if (m_rolePane == null) { // if (m_rolePane == null) {
@ -274,7 +273,6 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// } // }
// return m_rolePane; // return m_rolePane;
// } // }
/** /**
* Creates, and then caches, the workflow administration pane. Overriding * Creates, and then caches, the workflow administration pane. Overriding
* this method to return null will prevent this tab from appearing. * this method to return null will prevent this tab from appearing.
@ -308,12 +306,11 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// } // }
// return m_categoryPane; // return m_categoryPane;
// } // }
/** /**
* Creates, and then caches, the content type administration pane. * Creates, and then caches, the content type administration pane.
* Overriding this method to return null will prevent this tab from * Overriding this method to return null will prevent this tab from
* appearing. * appearing.
* *
* @return * @return
*/ */
protected ContentTypeAdminPane getContentTypeAdminPane() { protected ContentTypeAdminPane getContentTypeAdminPane() {
@ -340,24 +337,23 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
return m_csePane; return m_csePane;
} }
// ToDo NG protected ReportPane getReportPane() {
// protected ReportPane getReportPane() { if (m_reportPane == null) {
// if (m_reportPane == null) { m_reportPane = new ReportPane();
// m_reportPane = new ReportPane(); }
// } return m_reportPane;
// return m_reportPane; }
// }
/** /**
* Adds the specified component, with the specified tab name, to the tabbed * Adds the specified component, with the specified tab name, to the tabbed
* pane only if it is not null. * pane only if it is not null.
* *
* @param pane The pane to which to add the tab * @param pane The pane to which to add the tab
* @param tabName The name of the tab if it's added * @param tabName The name of the tab if it's added
* @param comp The component to add to the pane * @param comp The component to add to the pane
*/ */
protected void addToPane(final TabbedPane pane, protected void addToPane(final TabbedPane pane,
final String tabName, final String tabName,
final Component comp) { final Component comp) {
if (comp != null) { if (comp != null) {
pane.addTab(new Label(tabName), comp); pane.addTab(new Label(tabName), comp);
@ -400,7 +396,6 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
tab(pane, "cms.ui.content_types", getContentTypeAdminPane()); tab(pane, "cms.ui.content_types", getContentTypeAdminPane());
tab(pane, "cms.ui.cse", getCSEPane()); tab(pane, "cms.ui.cse", getCSEPane());
// ToDo NG tab(pane, "cms.ui.reports", getReportPane()); // ToDo NG tab(pane, "cms.ui.reports", getReportPane());
return pane; return pane;
} }
@ -437,7 +432,7 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
// } else if (pane == m_imagesPane) { // } else if (pane == m_imagesPane) {
// m_imagesPane.reset(state); // m_imagesPane.reset(state);
// } else // } else
if (pane == m_folderPane) { if (pane == m_folderPane) {
m_folderPane.reset(state); m_folderPane.reset(state);
//ToDo NG } else if (pane == m_browsePane) { //ToDo NG } else if (pane == m_browsePane) {
// m_browsePane.reset(state); // m_browsePane.reset(state);
@ -462,16 +457,16 @@ public class ContentSectionPage extends CMSPage implements ActionListener {
* Construct a URL for displaying the tab * Construct a URL for displaying the tab
* *
* @param item The item from which we get the corresponding content section * @param item The item from which we get the corresponding content section
* @param tab The index of the tab to display * @param tab The index of the tab to display
* *
* @return * @return
*/ */
public static String getSectionURL(final ContentItem item, final int tab) { public static String getSectionURL(final ContentItem item, final int tab) {
// Get the content section associated with the content item. // Get the content section associated with the content item.
final ContentSection section = item.getContentType().getContentSection(); final ContentSection section = item.getContentType().getContentSection();
final String url = section.getPrimaryUrl() + PageLocations.SECTION_PAGE final String url = section.getPrimaryUrl() + PageLocations.SECTION_PAGE
+ "?" + SET_TAB + "=" + tab; + "?" + SET_TAB + "=" + tab;
return url; return url;
} }