[Wonder-cvs] SF.net SVN: wonder:[8540] trunk/Wonder/Frameworks/Core/ERExtensions

[<tc...@us...>]

Revision: 8540
          http://wonder.svn.sourceforge.net/wonder/?rev=8540&view=rev
Author:   tcripps
Date:     2008-11-07 23:33:11 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
Enabled use of the ERXJSToManyRelationshipEditor through the ERXToManyRelationship.  Just set uiStyle = "jsEditor".  This means it is also available for D2W to-many relationships.

Modified Paths:
--------------
    trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.html
    trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.wod
    trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXToManyRelationship.java

Modified: trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.html
===================================================================
--- trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.html	2008-11-07 23:18:02 UTC (rev 8539)
+++ trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.html	2008-11-07 23:33:11 UTC (rev 8540)
@@ -1,5 +1,9 @@
-<WEBOBJECT NAME=IsBrowserConditional>
-	<WEBOBJECT NAME=BrowserList></WEBOBJECT>
-</WEBOBJECT>
-<WEBOBJECT NAME=IsCheckboxConditional><WEBOBJECT NAME=CheckboxMatrix><WEBOBJECT NAME=String></WEBOBJECT></WEBOBJECT>
-</WEBOBJECT>
\ No newline at end of file
+<webobject name="IsBrowserConditional">
+	<webobject name="BrowserList"></webobject>
+</webobject>
+<webobject name="IsCheckboxConditional">
+	<webobject name="CheckboxMatrix"><webobject name="CheckboxLabelString"></webobject></webobject>
+</webobject>
+<webobject name="IsJSEditorConditional">
+	<webobject name="JSEditor"></webobject>
+</webobject>
\ No newline at end of file

Modified: trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.wod
===================================================================
--- trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.wod	2008-11-07 23:18:02 UTC (rev 8539)
+++ trunk/Wonder/Frameworks/Core/ERExtensions/Components/Nonlocalized.lproj/ERXToManyRelationship.wo/ERXToManyRelationship.wod	2008-11-07 23:33:11 UTC (rev 8540)
@@ -7,6 +7,10 @@
 	size = ^size;
 }
 
+CheckboxLabelString: WOString {
+	value = theCurrentValue;
+}
+
 CheckboxMatrix: ERXCheckboxMatrix {
 	item = theCurrentItem;
 	list = theList;
@@ -19,15 +23,20 @@
 }
 
 IsBrowserConditional: WOConditional {
-	condition = isCheckBox;
-	negate = true;
+	condition = isBrowser;
 }
 
 IsCheckboxConditional: WOConditional {
 	condition = isCheckBox;
 }
 
-String: WOString {
-	value = theCurrentValue;
+IsJSEditorConditional: WOConditional {
+	condition = isJSEditor;
 }
 
+JSEditor: ERXJSToManyRelationshipEditor {
+	displayString = theCurrentValue;
+	item = theCurrentItem;
+	list = theList;
+	selections = selections;
+}

Modified: trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXToManyRelationship.java
===================================================================
--- trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXToManyRelationship.java	2008-11-07 23:18:02 UTC (rev 8539)
+++ trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXToManyRelationship.java	2008-11-07 23:33:11 UTC (rev 8540)
@@ -68,4 +68,12 @@
         }
         return _dataSource;
     }
+
+    public boolean isBrowser() {
+        return !(isCheckBox() || isJSEditor()); // Browser is the default.
+    }
+
+    public boolean isJSEditor() {
+        return "jsEditor".equalsIgnoreCase(uiStyle());
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.