You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/06/19 07:11:05 UTC
svn commit: r786372 - in /ofbiz/trunk:
applications/commonext/script/org/ofbiz/ applications/commonext/servicedef/
applications/commonext/webapp/ applications/commonext/webapp/WEB-INF/
applications/commonext/widget/ specialpurpose/myportal/webapp/mypor...
Author: hansbak
Date: Fri Jun 19 05:11:05 2009
New Revision: 786372
URL: http://svn.apache.org/viewvc?rev=786372&view=rev
Log:
add the 'delete' button to delete all user's system notes
Added:
ofbiz/trunk/applications/commonext/webapp/
ofbiz/trunk/applications/commonext/webapp/WEB-INF/
ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml (with props)
ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml (with props)
ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml (with props)
Modified:
ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
ofbiz/trunk/applications/commonext/servicedef/services.xml
ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
ofbiz/trunk/themes/flatgrey/includes/header.ftl
Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=786372&r1=786371&r2=786372&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml (original)
+++ ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml Fri Jun 19 05:11:05 2009
@@ -62,6 +62,12 @@
</simple-method>
+ <simple-method method-name="deleteAllSystemNotes" short-description="delete all system notes from a particular user">
+ <set field="removeData.noteParty" from-field="parameters.userLogin.partyId"/>
+ <set field="removeData.noteName" value="SYSTEMNOTE"/>
+ <remove-by-and entity-name="NoteData" map="removeData"/>
+ </simple-method>
+
<simple-method method-name="getSystemInfoStatus" short-description="">
<!-- communication events -->
<entity-count entity-name="CommunicationEventRole" count-field="comCount">
Modified: ofbiz/trunk/applications/commonext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/servicedef/services.xml?rev=786372&r1=786371&r2=786372&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/commonext/servicedef/services.xml Fri Jun 19 05:11:05 2009
@@ -31,7 +31,10 @@
<attribute name="entityName" type="String" mode="IN" optional="true"/>
<attribute name="entityNameId" type="String" mode="IN" optional="true"/>
</service>
-
+ <service name="deleteAllSystemNotes" engine="simple" auth="true"
+ location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="deleteAllSystemNotes">
+ <description>Delete all system notes for the logged on party</description>
+ </service>
<service name="getSystemInfoNotes" engine="simple" auth="true"
location="component://commonext/script/org/ofbiz/SystemInfoServices.xml" invoke="getSystemInfoNotes">
<description>Get system notes for the logged on party</description>
Added: ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml?rev=786372&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml (added)
+++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml Fri Jun 19 05:11:05 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
+ <description>Party Manager Module Site Configuration File</description>
+ <owner>Copyright 2001-2009 The Apache Software Foundation</owner>
+
+
+ <!-- Request Mappings -->
+ <request-map uri="deleteAllSystemNotes">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteAllSystemNotes"/>
+ <response name="success" type="view-last"/>
+ </request-map>
+</site-conf>
Propchange: ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/webapp/WEB-INF/controller.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml?rev=786372&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml (added)
+++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml Fri Jun 19 05:11:05 2009
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<web-app>
+ <display-name>Open For Business - Party Manager</display-name>
+ <description>Party Manager Module of the Open For Business Project</description>
+
+ <context-param>
+ <param-name>entityDelegatorName</param-name>
+ <param-value>default</param-value>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+ </context-param>
+ <context-param>
+ <param-name>localDispatcherName</param-name>
+ <param-value>commonext</param-value>
+ <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+ </context-param>
+ <context-param>
+ <param-name>mainDecoratorLocation</param-name>
+ <param-value>component://commonext/widget/CommonScreens.xml</param-value>
+ <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+ </context-param>
+ <context-param>
+ <param-name>serviceReaderUrls</param-name>
+ <param-value>/WEB-INF/services.xml</param-value>
+ <description>Configuration File(s) For The Service Dispatcher</description>
+ </context-param>
+ <context-param>
+ <param-name>scriptLocationPath</param-name>
+ <param-value>/WEB-INF/bsh</param-value>
+ <description>BeanShell Script Location</description>
+ </context-param>
+
+ <filter>
+ <filter-name>ContextFilter</filter-name>
+ <display-name>ContextFilter</display-name>
+ <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
+ <init-param>
+ <param-name>disableContextSecurity</param-name>
+ <param-value>N</param-value>
+ </init-param>
+ <init-param>
+ <param-name>allowedPaths</param-name>
+ <param-value>/control</param-value>
+ </init-param>
+ <init-param>
+ <param-name>errorCode</param-name>
+ <param-value>403</param-value>
+ </init-param>
+ <init-param>
+ <param-name>redirectPath</param-name>
+ <param-value>/control/main</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ContextFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
+ <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
+ <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
+ <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
+
+ <servlet>
+ <servlet-name>ControlServlet</servlet-name>
+ <display-name>ControlServlet</display-name>
+ <description>Main Control Servlet</description>
+ <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ControlServlet</servlet-name>
+ <url-pattern>/control/*</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>60</session-timeout> <!-- in minutes -->
+ </session-config>
+
+</web-app>
Propchange: ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml?rev=786372&view=auto
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml (added)
+++ ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml Fri Jun 19 05:11:05 2009
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+
+ <menu name="SystemInfoNotes">
+ <menu-item name="deleteAll" title="${uiLabelMap.CommonDeleteAll}">
+ <link target="deleteAllSystemNotes"/>
+ </menu-item>
+ </menu>
+
+</menus>
Propchange: ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/commonext/widget/SystemInfoMenus.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml?rev=786372&r1=786371&r2=786372&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml Fri Jun 19 05:11:05 2009
@@ -24,7 +24,8 @@
<screen name="SystemInfoNotes">
<section>
<widgets>
- <screenlet title="System Info notes for user: ${userLogin.partyId}">
+ <screenlet title="System Info notes for user: ${userLogin.partyId}" navigation-menu-name="SystemInfoNotes">
+ <include-menu name="SystemInfoNotes" location="component://commonext/widget/SystemInfoMenus.xml"/>
<include-form name="SystemInfoNotes" location="component://commonext/widget/SystemInfoForms.xml"/>
</screenlet>
</widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=786372&r1=786371&r2=786372&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Fri Jun 19 05:11:05 2009
@@ -24,6 +24,7 @@
<!-- so the order should be from most common to most specific-->
<include location="component://common/webcommon/WEB-INF/common-controller.xml"/>
<include location="component://common/webcommon/WEB-INF/portal-controller.xml"/>
+ <include location="component://commonext/webapp/WEB-INF/controller.xml"/>
<include location="component://party/webapp/partymgr/WEB-INF/controller.xml"/>
<include location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>
<include location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=786372&r1=786371&r2=786372&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Fri Jun 19 05:11:05 2009
@@ -137,7 +137,7 @@
<li class="logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"/></a></li>
</#if>
<li width=20/>
- <#if layoutSettings.middleTopMessage1?exists && layoutSettings.middleTopMessage1 != " ">
+ <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<li class=h4>
<div class="divHidden">
<center>${layoutSettings.middleTopHeader?if_exists}</center>