Commit Graph
440 Commits
Author SHA1 Message Date
Jacopo Cappellato ba18ab3728 Fixed bug that was preventing the red-when attribute to work properly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@797126 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 16:05:36 +00:00
Adrian Crum 1f76c2f5ec Moved user preferences code from Global Decorator to ScreenRenderer.java. Now user preferences can be queried before the Global Decorator is run.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796896 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 22:27:27 +00:00
Hans Bakker c5cc3ef131 removed debug log statements
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796244 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 10:32:48 +00:00
Anil Patel a8d9581734 Enhancement to dropdown element of form widget. Now it can handle data of types other then String.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@795315 13f79535-47bb-0310-9956-ffa450edef68
2009-07-18 05:27:54 +00:00
Adrian Crum e4ee374a66 Conversion from java.util.Calendar to com.ibm.icu.util.Calendar. I didn't convert the Cloud component - I wasn't sure if the Calendar class was being passed through SOAP.
OFBiz users who have modifications or add-ons can make the same substitution to get them to compile.

I'll let the dust settle from this, then I'll add the user-selected calendar capability.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792987 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 15:39:21 +00:00
Jacopo Cappellato d797f8fb8d Fixed issues with new renderers when a link was inserted in the form title. Thanks to Divesh Dutta for the bug report and partial fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792470 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 09:20:07 +00:00
Adrian Crum 28aa157ce9 Enabled HTML whitespace compression in MacroScreenViewHandler.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@792258 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 18:53:34 +00:00
Jacopo Cappellato 5a4f77bf34 Fix for bug reported by Hans Bakker in the dev list: passing field values containing ${...} directives was breaking the renderers macros because the renderer was attempting to execute them.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791841 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 14:04:36 +00:00
Jacopo Cappellato b2eb5fc5b1 Misc fixes for the text macro renderer's templates.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791442 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 11:25:49 +00:00
Scott Gray dec24b29f2 Sorry for the big commit, got a bit carried away.
Added override and deprecated annotations wherever they were missing
Removed the use of any deprecated classes/methods (except OutputFormat in UtilXml)
A few other random generics and misc. cleanups

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791212 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 10:01:19 +00:00
Scott Gray 9fa513efcb Add to new attributes to the Menu Widget's link element:
request-confirmation - if set to true displays a dialog requesting confirmation from the user before proceeding
confirmation-message - the confirmation request message to be displayed if the above is set to true

This removes the need to put javascript inside the menu widget when requesting confirmation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791126 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 13:34:18 +00:00
Scott Gray 762e3f6892 Allow disabling of a pagination on-event-update-area element by overriding with a blank target, part of OFBIZ-2661
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791110 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 12:14:30 +00:00
Scott Gray d9c97ff79e Fix javascript error caused by an unclosed quote mark
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791103 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 11:14:27 +00:00
Jacopo Cappellato 2645431346 Fix for a bug that was causing layout issues in widget forms definitions containing use-when directives when rendered thru FO.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@791046 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 01:35:53 +00:00
Jacopo Cappellato 266bbababb Misc fixes for the templates of the text widget macro widget renderer. Thanks to Rishi Solanki for the bug report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790894 13f79535-47bb-0310-9956-ffa450edef68
2009-07-03 13:04:49 +00:00
David E. Jones 7e981d3cb3 Added ability to specify an entity-condition as part of a view-entity in order to encapsulate a full query definition in a view-entity
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790472 13f79535-47bb-0310-9956-ffa450edef68
2009-07-02 06:43:50 +00:00
Adam Heath adeba4fd16 javac gets confused some times.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@790045 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 05:55:14 +00:00
Jacopo Cappellato 0ca20af910 Added missing </macro> tag. Thanks to Brajesh Patel for the bug report in OFBIZ-2671
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789855 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 18:05:55 +00:00
Adam Heath dd51c0108b Add a simple initCause helper method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789400 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 18:13:19 +00:00
Adam Heath ca695bb733 Mostly varied generics markup enhancements. A few scattered for-loop
changes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789397 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:48:07 +00:00
Adam Heath 9db067417a Strings are immuatable, no need to create a new copy of the string.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789396 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:45:41 +00:00
Adam Heath 694bfa838b No longer call rh.makeLink directly; instead, call appendOfbizUrl,
which already existed for this purpose.  This allows subclasses to
alter the behaviour.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789395 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:44:11 +00:00
Adam Heath 47555e158b Switch one last direct call to appendContentPrefix over to
appendContentUrl.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789394 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:40:41 +00:00
Adam Heath c38f64a05f Switch appendContentUrl to use the writer variant of
appendContentPrefix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789393 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:38:59 +00:00
Adam Heath 2bfec96a0f More string optimizations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789391 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:36:54 +00:00
Adam Heath cedc808624 Some more string optimizations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789384 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 17:00:44 +00:00
Adam Heath 27ba57cc88 No longer call RequestHandler.makeLink, instead calling
appendOfbizUrl, so that sub-classes have an easier time of it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789205 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 04:10:22 +00:00
Adam Heath 163506757f Convert some string additions to StringBuilder.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789203 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 03:30:06 +00:00
Adam Heath ce1751a60d Use the variant of ContentUrlTag.appendContentPrefix that takes an
Appendable.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789202 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 03:22:53 +00:00
Adam Heath 758cc25a46 Convert one direct call to ContentUrlTag.appendContentPrefix to the
local appendContentUrl.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789200 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 03:17:39 +00:00
Adam Heath 8ad5bb7271 Some string + to StringBuilder changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789191 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 02:21:05 +00:00
Adam Heath 818ff4987e Missed some appendable -> + conversions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789186 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 01:47:50 +00:00
Adam Heath a680a1019c Don't use + when calling append.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789183 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 01:27:19 +00:00
Adam Heath 2752e89c06 Switch to ContentUrlTag.appendContentPrefix to StringBuilder, and
deprecate to the StringBuffer variant.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789177 13f79535-47bb-0310-9956-ffa450edef68
2009-06-28 23:50:53 +00:00
Adam Heath 9b9c840047 Improve generics.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@789045 13f79535-47bb-0310-9956-ffa450edef68
2009-06-28 05:06:30 +00:00
Jacopo Cappellato 33a12bff54 Wrong macro parameters defined in the text widget macro library. Thanks to Brajesh Patel for the bug report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@788793 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:58:14 +00:00
Hans Bakker 39901c20f8 allow date-time attribute on a display field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@787138 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 04:23:50 +00:00
Jacopo Cappellato 3193098744 Applied fix for pagination in new macro renderers from Guo Weizhan: OFBIZ-2549
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@786387 13f79535-47bb-0310-9956-ffa450edef68
2009-06-19 06:32:05 +00:00
Jacopo Cappellato e8706c3e9f Tabs to spaces.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785955 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 08:38:32 +00:00
Jacopo Cappellato 51e0384926 Applied fix from Marco Risaliti for locale related issue in sub content rendering.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785954 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 08:36:16 +00:00
Jacopo Cappellato dcdffcc54e Added missing arguments to widget renderer macro; thanks to Marco Risaliti for the fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785509 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 08:43:28 +00:00
Scott Gray e4590fdaaa Complete the partial support for nested menu items, e.g.
<menu-item name="a" title="A">
    <link target="aLink"></link>
    <menu-item name="b" title="B">
        <link target="bLink"/>
    </menu-item>
</menu-item>
basically renders:
<li>
  <a href="aLink">A</a>
  <ul>
    <li>
      <a href="bLink">B</a>
    </li>
  </ul>
</li>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@785077 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 04:37:42 +00:00
Scott Gray e9ac9be355 The form field's encode-output attribute wasn't being merged/overridden
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@784646 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 03:38:03 +00:00
Adrian Crum 5990ac186b Made a few changes to the HTML view handlers. Multiple DOCTYPE declarations were being generated when screens included other screens. Problem reported by Ryan Foster - https://issues.apache.org/jira/browse/OFBIZ-2543.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779751 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 19:57:53 +00:00
Jacques Le Roux d8ddbf314f Fix a comment and javadoc (I will backport in R9.04 because of javadoc)
A patch from Ashish Vijaywargiya "Wrong Property File Name specified" (https://issues.apache.org/jira/browse/OFBIZ-2495) - OFBIZ-2495


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776594 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 07:10:32 +00:00
Adrian Crum f5473d2589 Updated model widgets to use operator substitution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772709 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 16:58:40 +00:00
Adrian Crum 0654f711a6 Added XML-friendly operator substitution to BeanShell and Groovy. BeanShell already supported operator substitution, but I extended it to convert apostrophes to quotes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772699 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 16:30:02 +00:00
Scott Gray cd6bbff043 Fix the problem of fields without a use-when not overriding fields with a use-when condition OFBIZ-863
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772464 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 23:26:00 +00:00
Scott Gray c17442843c Code cleanup, removed unused imports, some unnecessary casts and one unnecessary null check, changed some whiles to enhanced fors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771147 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:25:57 +00:00
Scott Gray 05f15421aa Fixed a FIXME, moved \n -> <BR/> replacement from the renderer to the html macro
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771146 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:04:58 +00:00