From: Anjo K. <an...@us...> - 2007-05-31 11:00:41
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Resources In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31037/Resources Modified Files: d2w.d2wmodel.txt d2w.d2wmodel Log Message: renamed display name for keypath default Index: d2w.d2wmodel.txt =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** d2w.d2wmodel.txt 30 May 2007 16:31:28 -0000 1.14 --- d2w.d2wmodel.txt 31 May 2007 11:00:33 -0000 1.15 *************** *** 197,201 **** 10 : (task = 'edit' or task = 'inspect') => shouldShowCancelButton = true [com.webobjects.directtoweb.BooleanAssignment], 10 : *true* => deleteSelectedButtonLabel = ERD2W.deleteSelectedButtonLabel [er.directtoweb.ERDDelayedLocalizedAssignment], - 10 : *true* => displayNameForKeyPath = <ERDDefaultDisplayNameAssignment> [er.directtoweb.ERDDefaultDisplayNameAssignment], 10 : *true* => displayNameForProperty = <ERDDefaultDisplayNameAssignment> [er.directtoweb.ERDDefaultDisplayNameAssignment], 10 : destinationEntity.name like '*' => embeddedEntityName = destinationEntity.name [er.directtoweb.ERDKeyValueAssignment], --- 197,200 ---- *************** *** 209,212 **** --- 208,212 ---- 10 : (smartAttribute.allowsNull = 0 and propertyType = 'a') => isMandatory = true [com.webobjects.directtoweb.BooleanAssignment], 10 : (pageConfiguration like 'Create*' or pageConfiguration like 'Edit*') => task = edit [com.webobjects.directtoweb.Assignment], + 10 : *true* => displayNameForPropertyKeyPath = <ERDDefaultDisplayNameAssignment> [er.directtoweb.ERDDefaultDisplayNameAssignment], 10 : isEmbeddedInForm = 1 => batchNavigationBarComponentName = ERXBatchNavigationBarInForm [com.webobjects.directtoweb.Assignment], 10 : (smartAttribute.allowsNull = 1 or isMandatory = 0) => choicesNames = (Yes, No, Unset) [com.webobjects.directtoweb.Assignment], Index: d2w.d2wmodel =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** d2w.d2wmodel 30 May 2007 16:31:28 -0000 1.113 --- d2w.d2wmodel 31 May 2007 11:00:35 -0000 1.114 *************** *** 197,201 **** {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "inspect"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "shouldShowCancelButton"; "value" = "true"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDelayedLocalizedAssignment"; "keyPath" = "deleteSelectedButtonLabel"; "value" = "ERD2W.deleteSelectedButtonLabel"; }; }, - {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDefaultDisplayNameAssignment"; "keyPath" = "displayNameForKeyPath"; "value" = "<ERDDefaultDisplayNameAssignment>"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDefaultDisplayNameAssignment"; "keyPath" = "displayNameForProperty"; "value" = "<ERDDefaultDisplayNameAssignment>"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "destinationEntity.name"; "selectorName" = "isLike"; "value" = "*"; }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "embeddedEntityName"; "value" = "destinationEntity.name"; }; }, --- 197,200 ---- *************** *** 208,211 **** --- 207,211 ---- {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "smartAttribute.allowsNull"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "0"; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyType"; "selectorName" = "isEqualTo"; "value" = "a"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "isMandatory"; "value" = "true"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "Create*"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "Edit*"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "task"; "value" = "edit"; }; }, + {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDefaultDisplayNameAssignment"; "keyPath" = "displayNameForPropertyKeyPath"; "value" = "<ERDDefaultDisplayNameAssignment>"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "isEmbeddedInForm"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "1"; }; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "batchNavigationBarComponentName"; "value" = "ERXBatchNavigationBarInForm"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "smartAttribute.allowsNull"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "1"; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "isMandatory"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "0"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "choicesNames"; "value" = ("Yes", "No", "Unset"); }; }, |