You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Adrian Crum <ad...@hlmksw.com> on 2007/08/31 17:17:11 UTC
Re: svn commit: r571393 - in /ofbiz/branches/release4.0/applications/content/widget/forum:
ForumForms.xml ForumScreens.xml
Jacques,
Thank you very much for keeping up with these! I'm so swamped at work that I don't have time to
commit fixes to R4.
-Adrian
jleroux@apache.org wrote:
> Author: jleroux
> Date: Fri Aug 31 00:45:47 2007
> New Revision: 571393
>
> URL: http://svn.apache.org/viewvc?rev=571393&view=rev
> Log:
> Applied fix from trunk for revision: 571337
>
> Modified:
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
>
> Modified: ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml?rev=571393&r1=571392&r2=571393&view=diff
> ==============================================================================
> --- ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml (original)
> +++ ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml Fri Aug 31 00:45:47 2007
> @@ -153,6 +153,7 @@
> <field name="toDate"><hidden value="${contentAssoc.toDate}"/></field>
> <field name="contentIdTo"><hidden/></field>
> <field name="contentAssocTypeId"><hidden value="RESPONSE"/></field>
> + <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
> <field name="forumMessageText" parameter-name="textData"><textarea rows="10"/></field>
> <field name="addButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
> </form>
> @@ -183,9 +184,10 @@
> <field name="rsp.ownerContentId" parameter-name="ownerContentId"><hidden/></field>
> <field name="rsp.caFromDate" parameter-name="fromDate"><hidden/></field>
> <field name="rsp.caThruDate" parameter-name="thruDate"><hidden/></field>
> - <field name="rsp.caContentIdTo" parameter-name="contentIdTo"><hidden/></field>
> - <field name="rsp.caContentAssocTypeId" parameter-name="contentAssocTypeId"><hidden/></field>
> + <field name="rsp.caContentIdTo" parameter-name="caContentIdTo"><hidden/></field>
> + <field name="rsp.caContentAssocTypeId" parameter-name="caContentAssocTypeId"><hidden/></field>
> + <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
> <field name="textData"><textarea rows="8"/></field>
> - <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
> + <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
> </form>
> </forms>
>
> Modified: ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml?rev=571393&r1=571392&r2=571393&view=diff
> ==============================================================================
> --- ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml (original)
> +++ ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml Fri Aug 31 00:45:47 2007
> @@ -147,7 +147,7 @@
> <set field="objectName" from-field="forum.contentName"/>
> <set field="objectId" from-field="forum.contentId"/>
> <set field="forumNbrMessages" from-field="forum.childBranchCount" default-value="0"/>
> - <entity-and entity-name="ContentAssocViewFrom" list-name="forumMessages">
> + <entity-and entity-name="ContentAssocViewTo" list-name="forumMessages">
> <field-map field-name="ownerContentId" env-name="parameters.forumId"/>
> <order-by field-name="createdDate DESC"/>
> </entity-and>
>
>
>
Re: svn commit: r571393 - in
/ofbiz/branches/release4.0/applications/content/widget/forum: ForumForms.xml
ForumScreens.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
Thanks Scott,
I really appreciated your commitment on this task. Last David's comments have cooled my fervor ;o)
Nevertheless, I will try to have a look at it. I still believe that the less merges from trunk we miss the easier will be our task
later (notably in case intermediate fixes miss)
Thanks
Jacques
De : "Scott Gray" <le...@gmail.com>
Hi Jacques
I think my last merge was from 557582 or somewhere round there anyway. I
wouldn't worry too much about trying to catch everything though, if things
get missed sooner or later someone will report the bug for 4.0 and then we
can find the trunk fix and merge it back anyway.
Regards
Scott
On 01/09/2007, Jacques Le Roux <ja...@les7arts.com> wrote:
>
> You are welcome Adrian,
>
> Actually Scott was doing this task some time ago but I noticed these last
> days that this was anymore the case. So I took it over.
> Maybe in the meantime some commits have been "lost". I'm not sure to find
> the time to review all commits since last Scott's, any
> ideas mates ?
>
> Jacques
>
>
> ----- Message d'origine -----
> De : "Adrian Crum" <ad...@hlmksw.com>
> À : <de...@ofbiz.apache.org>
> Envoyé : vendredi 31 août 2007 17:17
> Objet : Re: svn commit: r571393 - in
> /ofbiz/branches/release4.0/applications/content/widget/forum:
> ForumForms.xml ForumScreens.xml
>
>
> > Jacques,
> >
> > Thank you very much for keeping up with these! I'm so swamped at work
> that I don't have time to
> > commit fixes to R4.
> >
> > -Adrian
> >
> > jleroux@apache.org wrote:
> >
> > > Author: jleroux
> > > Date: Fri Aug 31 00:45:47 2007
> > > New Revision: 571393
> > >
> > > URL: http://svn.apache.org/viewvc?rev=571393&view=rev
> > > Log:
> > > Applied fix from trunk for revision: 571337
> > >
> > > Modified:
> > >
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> > >
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> > >
> > > Modified:
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> > > URL:
>
>
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml?rev=571393&r1=571392&r2=571393&view=diff
> > >
> ==============================================================================
> > > ---
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> (original)
> > > +++
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> Fri Aug 31 00:45:47 2007
> > > @@ -153,6 +153,7 @@
> > > <field name="toDate"><hidden value="${contentAssoc.toDate
> }"/></field>
> > > <field name="contentIdTo"><hidden/></field>
> > > <field name="contentAssocTypeId"><hidden
> value="RESPONSE"/></field>
> > > + <field name="dataResourceTypeId"><hidden
> value="ELECTRONIC_TEXT"/></field>
> > > <field name="forumMessageText"
> parameter-name="textData"><textarea rows="10"/></field>
> > > <field name="addButton" title="${uiLabelMap.CommonUpdate}"
> widget-style="smallSubmit"><submit
> button-type="button"/></field>
> > > </form>
> > > @@ -183,9 +184,10 @@
> > > <field name="rsp.ownerContentId"
> parameter-name="ownerContentId"><hidden/></field>
> > > <field name="rsp.caFromDate"
> parameter-name="fromDate"><hidden/></field>
> > > <field name="rsp.caThruDate"
> parameter-name="thruDate"><hidden/></field>
> > > - <field name="rsp.caContentIdTo"
> parameter-name="contentIdTo"><hidden/></field>
> > > - <field name="rsp.caContentAssocTypeId"
> parameter-name="contentAssocTypeId"><hidden/></field>
> > > + <field name="rsp.caContentIdTo"
> parameter-name="caContentIdTo"><hidden/></field>
> > > + <field name="rsp.caContentAssocTypeId"
> parameter-name="caContentAssocTypeId"><hidden/></field>
> > > + <field name="dataResourceTypeId"><hidden
> value="ELECTRONIC_TEXT"/></field>
> > > <field name="textData"><textarea rows="8"/></field>
> > > - <field name="updateButton" title="${uiLabelMap.CommonUpdate}"
> widget-style="smallSubmit"><submit
> button-type="button"/></field>
> > > + <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit
> button-type="button"/></field>
> > > </form>
> > > </forms>
> > >
> > > Modified:
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> > > URL:
>
>
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml?rev=571393&r1=571392&r2=571393&view=diff
> > >
> ==============================================================================
> > > ---
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> (original)
> > > +++
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> Fri Aug 31 00:45:47 2007
> > > @@ -147,7 +147,7 @@
> > > <set field="objectName" from-field="forum.contentName
> "/>
> > > <set field="objectId" from-field="forum.contentId"/>
> > > <set field="forumNbrMessages" from-field="
> forum.childBranchCount" default-value="0"/>
> > > - <entity-and entity-name="ContentAssocViewFrom"
> list-name="forumMessages">
> > > + <entity-and entity-name="ContentAssocViewTo"
> list-name="forumMessages">
> > > <field-map field-name="ownerContentId" env-name="
> parameters.forumId"/>
> > > <order-by field-name="createdDate DESC"/>
> > > </entity-and>
> > >
> > >
> > >
>
>
Re: svn commit: r571393 - in /ofbiz/branches/release4.0/applications/content/widget/forum: ForumForms.xml ForumScreens.xml
Posted by Scott Gray <le...@gmail.com>.
Hi Jacques
I think my last merge was from 557582 or somewhere round there anyway. I
wouldn't worry too much about trying to catch everything though, if things
get missed sooner or later someone will report the bug for 4.0 and then we
can find the trunk fix and merge it back anyway.
Regards
Scott
On 01/09/2007, Jacques Le Roux <ja...@les7arts.com> wrote:
>
> You are welcome Adrian,
>
> Actually Scott was doing this task some time ago but I noticed these last
> days that this was anymore the case. So I took it over.
> Maybe in the meantime some commits have been "lost". I'm not sure to find
> the time to review all commits since last Scott's, any
> ideas mates ?
>
> Jacques
>
>
> ----- Message d'origine -----
> De : "Adrian Crum" <ad...@hlmksw.com>
> À : <de...@ofbiz.apache.org>
> Envoyé : vendredi 31 août 2007 17:17
> Objet : Re: svn commit: r571393 - in
> /ofbiz/branches/release4.0/applications/content/widget/forum:
> ForumForms.xml ForumScreens.xml
>
>
> > Jacques,
> >
> > Thank you very much for keeping up with these! I'm so swamped at work
> that I don't have time to
> > commit fixes to R4.
> >
> > -Adrian
> >
> > jleroux@apache.org wrote:
> >
> > > Author: jleroux
> > > Date: Fri Aug 31 00:45:47 2007
> > > New Revision: 571393
> > >
> > > URL: http://svn.apache.org/viewvc?rev=571393&view=rev
> > > Log:
> > > Applied fix from trunk for revision: 571337
> > >
> > > Modified:
> > >
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> > >
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> > >
> > > Modified:
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> > > URL:
>
> http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml?rev=571393&r1=571392&r2=571393&view=diff
> > >
> ==============================================================================
> > > ---
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> (original)
> > > +++
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> Fri Aug 31 00:45:47 2007
> > > @@ -153,6 +153,7 @@
> > > <field name="toDate"><hidden value="${contentAssoc.toDate
> }"/></field>
> > > <field name="contentIdTo"><hidden/></field>
> > > <field name="contentAssocTypeId"><hidden
> value="RESPONSE"/></field>
> > > + <field name="dataResourceTypeId"><hidden
> value="ELECTRONIC_TEXT"/></field>
> > > <field name="forumMessageText"
> parameter-name="textData"><textarea rows="10"/></field>
> > > <field name="addButton" title="${uiLabelMap.CommonUpdate}"
> widget-style="smallSubmit"><submit
> button-type="button"/></field>
> > > </form>
> > > @@ -183,9 +184,10 @@
> > > <field name="rsp.ownerContentId"
> parameter-name="ownerContentId"><hidden/></field>
> > > <field name="rsp.caFromDate"
> parameter-name="fromDate"><hidden/></field>
> > > <field name="rsp.caThruDate"
> parameter-name="thruDate"><hidden/></field>
> > > - <field name="rsp.caContentIdTo"
> parameter-name="contentIdTo"><hidden/></field>
> > > - <field name="rsp.caContentAssocTypeId"
> parameter-name="contentAssocTypeId"><hidden/></field>
> > > + <field name="rsp.caContentIdTo"
> parameter-name="caContentIdTo"><hidden/></field>
> > > + <field name="rsp.caContentAssocTypeId"
> parameter-name="caContentAssocTypeId"><hidden/></field>
> > > + <field name="dataResourceTypeId"><hidden
> value="ELECTRONIC_TEXT"/></field>
> > > <field name="textData"><textarea rows="8"/></field>
> > > - <field name="updateButton" title="${uiLabelMap.CommonUpdate}"
> widget-style="smallSubmit"><submit
> button-type="button"/></field>
> > > + <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit
> button-type="button"/></field>
> > > </form>
> > > </forms>
> > >
> > > Modified:
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> > > URL:
>
> http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml?rev=571393&r1=571392&r2=571393&view=diff
> > >
> ==============================================================================
> > > ---
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> (original)
> > > +++
> ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> Fri Aug 31 00:45:47 2007
> > > @@ -147,7 +147,7 @@
> > > <set field="objectName" from-field="forum.contentName
> "/>
> > > <set field="objectId" from-field="forum.contentId"/>
> > > <set field="forumNbrMessages" from-field="
> forum.childBranchCount" default-value="0"/>
> > > - <entity-and entity-name="ContentAssocViewFrom"
> list-name="forumMessages">
> > > + <entity-and entity-name="ContentAssocViewTo"
> list-name="forumMessages">
> > > <field-map field-name="ownerContentId" env-name="
> parameters.forumId"/>
> > > <order-by field-name="createdDate DESC"/>
> > > </entity-and>
> > >
> > >
> > >
>
>
Re: svn commit: r571393 - in
/ofbiz/branches/release4.0/applications/content/widget/forum: ForumForms.xml
ForumScreens.xml
Posted by Jacques Le Roux <ja...@les7arts.com>.
You are welcome Adrian,
Actually Scott was doing this task some time ago but I noticed these last days that this was anymore the case. So I took it over.
Maybe in the meantime some commits have been "lost". I'm not sure to find the time to review all commits since last Scott's, any
ideas mates ?
Jacques
----- Message d'origine -----
De : "Adrian Crum" <ad...@hlmksw.com>
À : <de...@ofbiz.apache.org>
Envoyé : vendredi 31 août 2007 17:17
Objet : Re: svn commit: r571393 - in /ofbiz/branches/release4.0/applications/content/widget/forum: ForumForms.xml ForumScreens.xml
> Jacques,
>
> Thank you very much for keeping up with these! I'm so swamped at work that I don't have time to
> commit fixes to R4.
>
> -Adrian
>
> jleroux@apache.org wrote:
>
> > Author: jleroux
> > Date: Fri Aug 31 00:45:47 2007
> > New Revision: 571393
> >
> > URL: http://svn.apache.org/viewvc?rev=571393&view=rev
> > Log:
> > Applied fix from trunk for revision: 571337
> >
> > Modified:
> > ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> > ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> >
> > Modified: ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml
> > URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml?rev=571393&r1=571392&r2=571393&view=diff
> > ==============================================================================
> > --- ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml (original)
> > +++ ofbiz/branches/release4.0/applications/content/widget/forum/ForumForms.xml Fri Aug 31 00:45:47 2007
> > @@ -153,6 +153,7 @@
> > <field name="toDate"><hidden value="${contentAssoc.toDate}"/></field>
> > <field name="contentIdTo"><hidden/></field>
> > <field name="contentAssocTypeId"><hidden value="RESPONSE"/></field>
> > + <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
> > <field name="forumMessageText" parameter-name="textData"><textarea rows="10"/></field>
> > <field name="addButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
> > </form>
> > @@ -183,9 +184,10 @@
> > <field name="rsp.ownerContentId" parameter-name="ownerContentId"><hidden/></field>
> > <field name="rsp.caFromDate" parameter-name="fromDate"><hidden/></field>
> > <field name="rsp.caThruDate" parameter-name="thruDate"><hidden/></field>
> > - <field name="rsp.caContentIdTo" parameter-name="contentIdTo"><hidden/></field>
> > - <field name="rsp.caContentAssocTypeId" parameter-name="contentAssocTypeId"><hidden/></field>
> > + <field name="rsp.caContentIdTo" parameter-name="caContentIdTo"><hidden/></field>
> > + <field name="rsp.caContentAssocTypeId" parameter-name="caContentAssocTypeId"><hidden/></field>
> > + <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
> > <field name="textData"><textarea rows="8"/></field>
> > - <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
> > + <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
> > </form>
> > </forms>
> >
> > Modified: ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml
> > URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml?rev=571393&r1=571392&r2=571393&view=diff
> > ==============================================================================
> > --- ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml (original)
> > +++ ofbiz/branches/release4.0/applications/content/widget/forum/ForumScreens.xml Fri Aug 31 00:45:47 2007
> > @@ -147,7 +147,7 @@
> > <set field="objectName" from-field="forum.contentName"/>
> > <set field="objectId" from-field="forum.contentId"/>
> > <set field="forumNbrMessages" from-field="forum.childBranchCount" default-value="0"/>
> > - <entity-and entity-name="ContentAssocViewFrom" list-name="forumMessages">
> > + <entity-and entity-name="ContentAssocViewTo" list-name="forumMessages">
> > <field-map field-name="ownerContentId" env-name="parameters.forumId"/>
> > <order-by field-name="createdDate DESC"/>
> > </entity-and>
> >
> >
> >