You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Matthieu Bollot <ma...@nereide.biz> on 2010/01/11 14:37:45 UTC

Re: svn commit: r897716 - in /ofbiz/trunk/applications/party/widget/partymgr: CommonScreens.xml CommunicationEventScreens.xml PartyMenus.xml

Hi all,

Since this night, some menus have disappeared, when viewing an email in
https://localhost:8443/partymgr/control/ViewCommunicationEvent there
were two buttons, reply and forward which are not there anymore. (it
needs to select an email first, in
https://localhost:8443/partymgr/control/FindCommunicationEvents)

As they are located in PartyMenus.xml, it could be this commit (or
related to it)

It's hard to explain, but to reproduce you can download
http://selenium.neogia.org/ofbiz/tests/CreateAndManageCommunication.html
and run it using selenium IDE.

cheers,


Le dimanche 10 janvier 2010 à 22:03 +0000, buscob@apache.org a écrit :
> Author: buscob
> Date: Sun Jan 10 22:03:08 2010
> New Revision: 897716
> 
> URL: http://svn.apache.org/viewvc?rev=897716&view=rev
> Log:
> Fixed common decorator use in FindCommunicationEvents screen.
> 
> Modified:
>     ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
>     ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
>     ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
> 
> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=897716&r1=897715&r2=897716&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sun Jan 10 22:03:08 2010
> @@ -177,14 +177,22 @@
>              </actions>
>              <widgets>
>                  <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
> -                    <decorator-section name="body">
> +                    <decorator-section name="pre-body">
>                          <section>
>                              <condition>
>                                  <if-has-permission action="_VIEW" permission="PARTYMGR"/>
>                              </condition>
>                              <widgets>
>                                  <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/>
> -                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommSubTabBar"/>
> +                            </widgets>
> +                        </section>
> +                    </decorator-section>
> +                    <decorator-section name="body">
> +                        <section>
> +                            <condition>
> +                                <if-has-permission action="_VIEW" permission="PARTYMGR"/>
> +                            </condition>
> +                            <widgets>
>                                  <decorator-section-include name="body"/>
>                              </widgets>
>                              <fail-widgets>
> 
> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=897716&r1=897715&r2=897716&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sun Jan 10 22:03:08 2010
> @@ -227,7 +227,7 @@
>                              </condition>
>                              <widgets>
>                                  <screenlet title="${uiLabelMap.PageTitleListUnknownPartyComms}">
> -                                <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListUnknownPartyEmails"/>
> +                                    <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListUnknownPartyEmails"/>
>                                  </screenlet>
>                              </widgets>
>                              <fail-widgets>
> @@ -248,17 +248,18 @@
>                  <set field="entityName" value="CommunicationEventAndRole"/>
>              </actions>
>              <widgets>
> -                <decorator-screen location="${parameters.mainDecoratorLocation}" name="main-decorator">
> +                <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}">
>                      <decorator-section name="body">
>                          <section>
>                              <condition>
>                                  <if-service-permission service-name="partyCommunicationEventPermissionCheck" main-action="VIEW"/>
>                              </condition>
>                              <widgets>
> -                                <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/>
>                                  <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
>                                      <decorator-section name="menu-bar">
> -                                        <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
> +                                        <container style="button-bar">
> +                                            <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/>
> +                                        </container>
>                                      </decorator-section>
>                                      <decorator-section name="search-options">
>                                          <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="findCommEvents"/>
> 
> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=897716&r1=897715&r2=897716&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Jan 10 22:03:08 2010
> @@ -533,7 +533,6 @@
>      </menu>
>      <menu name="CommEventTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
>          <menu-item name="Find" title="${uiLabelMap.CommonFind}">
> -            <condition><if-compare field="tabButtonItem" operator="not-equals" value="Find"/></condition>
>              <link target="FindCommunicationEvents"/>
>          </menu-item>
>          <menu-item name="OverView" title="${uiLabelMap.CommonOverview}">
> @@ -618,8 +617,7 @@
>          </menu-item>
>      </menu>
>  
> -    <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
> -        menu-container-style="button-bar button-style-2 no-clear">
> +    <menu name="CommSubTabBar">
>          <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
>              <link target="EditCommunicationEvent"/>
>          </menu-item>
> 
> 

-- 
Matthieu BOLLOT
www.nereide.biz