Commit Graph
528 Commits
Author SHA1 Message Date
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
Adam Heath 1a31984695 Several minor generics fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771124 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 20:35:52 +00:00
Hans Bakker 71c58d0756 portal page generated menu changed other menus when cache was enabled, tabs for spaces and deleted empty forms file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771035 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 07:38:25 +00:00
Scott Gray d3bb5b5eb1 Fixed issue reported by Sascha Rodekamp on the user mailing list
enableEditValue was being treated like a boolean but was actually a String

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770501 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 00:36:32 +00:00
Andrew Zeneski f36c5a9335 No longer requiring the boolean field 'expanded' as part of the API; after dicussing w/ Adrian; the FSE can handle pre-expanded strings
Added new API method findMatchingPermission() which takes a regular expression for the base permission returning the value of all matching permissions (see unit tests)
Fixed missing base permission in SecurityData.xml

JIRA OFBIZ-2381


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770401 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 19:14:48 +00:00
Jacopo Cappellato 2d2e4870bf Migrated code, and adjusted to work with the new macro renderers, that implements the in-place editor for display fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770243 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 14:32:45 +00:00
Jacopo Cappellato 94b153c12a Fixed wrong name of the key used to retrieve the values for checkboxes; OFBIZ-2391 (thanks to Hans Bakker for the bug report).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 09:23:35 +00:00
Adam Heath 9840b7cc1c Fix some StringBuffer usage that has crept in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770030 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 01:22:44 +00:00
Andrew Zeneski 4027891ed9 integration with new Authz API - JIRA OFBIZ-2381
NOTE: when using the action="" the old API is always used; when no action is specified the new API is used



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@769943 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:27:59 +00:00
Jacques Le Roux bf299998db A patch from dukian "Tree widget doesn't apply parameter tag as Menu" (https://issues.apache.org/jira/browse/OFBIZ-2325) - OFBIZ-2325
Thanks to Jacopo's comment which helped a lot to test!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768811 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 22:14:29 +00:00
Jacques Le Roux ae10eaaed3 Fix a bug (seems a typo), see dev ML for more
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768490 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 07:34:36 +00:00
Jacopo Cappellato 9eaac35f4d Implemented macros for new renderers methods for creen widgets; cleaned up SimpleDecorator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768213 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 07:59:08 +00:00
Adrian Crum 1a4496c172 Some work on the screen widgets:
1. Added renderScreenBegin and renderScreenEnd methods to ScreenStringRenderer.java.
2. Updated HtmlScreenRenderer.java and MacroScreenRenderer.java to emit the <DOCTYPE> element first - before any widget comments or template content.
3. Removed <DOCTYPE> elements from templates that no longer need them.
4. Added screen and section boundary comments to MacroScreenRenderer.java.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767996 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 17:54:30 +00:00