[svn r345] WIP for editor support
This commit is contained in:
willemc
parent
4643057b7f
commit
5d64bde0bd
48 changed files with 1071 additions and 268 deletions
|
|
@ -58,6 +58,8 @@ public class TestModelVascDataSource extends AbstractVascBackend implements Vasc
|
|||
t.setDescription("yoyo test");
|
||||
t.setName("this Name");
|
||||
t.setPrice(34.1f);
|
||||
t.setActive(true);
|
||||
t.setHexColor("#FF66EE");
|
||||
testModels.add(t);
|
||||
|
||||
t = new TestModel();
|
||||
|
|
@ -65,6 +67,8 @@ public class TestModelVascDataSource extends AbstractVascBackend implements Vasc
|
|||
t.setDescription("Model2 test");
|
||||
t.setName("BeanSourde");
|
||||
t.setPrice(19.2f);
|
||||
t.setActive(false);
|
||||
t.setTestModel((TestModel)testModels.get(0));
|
||||
testModels.add(t);
|
||||
}
|
||||
public TestModelVascDataSource(List<Object> testModels) {
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ import com.idcanet.vasc.core.VascEntry;
|
|||
import com.idcanet.vasc.core.VascEntryField;
|
||||
import com.idcanet.vasc.core.ui.VascList;
|
||||
import com.idcanet.vasc.impl.DefaultVascBackedEntryFinalizer;
|
||||
import com.idcanet.vasc.impl.DefaultVascBackendController;
|
||||
import com.idcanet.vasc.impl.DefaultVascBackendControllerResolver;
|
||||
import com.idcanet.vasc.impl.DefaultVascEntryController;
|
||||
import com.idcanet.vasc.impl.DefaultVascEntryControllerResolver;
|
||||
import com.idcanet.vasc.impl.DefaultVascFrontendEntryFinalizer;
|
||||
import com.idcanet.vasc.impl.DefaultVascController;
|
||||
import com.idcanet.vasc.impl.DefaultVascEntry;
|
||||
|
|
@ -63,18 +67,23 @@ public class TestTable {
|
|||
|
||||
static VascController getDefaultVascController() throws Exception {
|
||||
|
||||
// for test
|
||||
TestModelVascDataSource backend = new TestModelVascDataSource();
|
||||
backend.setId("testBackend");
|
||||
|
||||
// config full controller for local jvm use
|
||||
DefaultVascController c = new DefaultVascController();
|
||||
|
||||
DefaultVascBackendControllerResolver vascBackendControllerResolver = new DefaultVascBackendControllerResolver();
|
||||
DefaultVascBackendController vascBackendController = new DefaultVascBackendController();
|
||||
vascBackendController.addVascBackend(backend);
|
||||
vascBackendControllerResolver.setVascBackendController(vascBackendController);
|
||||
c.setVascBackendControllerResolver(vascBackendControllerResolver);
|
||||
|
||||
//DefaultVascBackendControllerResolver vascBackendControllerResolver = new DefaultVascBackendControllerResolver();
|
||||
//c.setVascBackendControllerResolver(vascBackendControllerResolver);
|
||||
|
||||
|
||||
|
||||
//DefaultVascEntryControllerResolver vascEntryControllerResolver = new DefaultVascEntryControllerResolver();
|
||||
//c.setVascEntryControllerResolver(vascEntryControllerResolver);
|
||||
|
||||
|
||||
DefaultVascEntryControllerResolver vascEntryControllerResolver = new DefaultVascEntryControllerResolver();
|
||||
DefaultVascEntryController vascEntryController = new DefaultVascEntryController();
|
||||
vascEntryControllerResolver.setVascEntryController(vascEntryController);
|
||||
c.setVascEntryControllerResolver(vascEntryControllerResolver);
|
||||
|
||||
DefaultVascEntryFieldTypeControllerResolver vascEntryFieldTypeControllerResolver = new DefaultVascEntryFieldTypeControllerResolver();
|
||||
DefaultVascEntryFieldTypeController vascEntryFieldTypeController = new DefaultVascEntryFieldTypeController();
|
||||
|
|
@ -87,34 +96,24 @@ public class TestTable {
|
|||
|
||||
|
||||
static public VascEntry getVascTable() throws Exception {
|
||||
|
||||
// define query
|
||||
/*
|
||||
XTESParser parser = new XTESParser();
|
||||
parser.parseResource("/resources/xtes/tests.xml");
|
||||
TemplateStore store = XTESParser.getTemplateStore(parser.getElementContext());
|
||||
Query query = store.getQuery("testUsers2");
|
||||
*/
|
||||
|
||||
|
||||
VascController c = getDefaultVascController();
|
||||
|
||||
TestModelVascDataSource data = new TestModelVascDataSource();
|
||||
|
||||
|
||||
// config table
|
||||
VascEntry entry = new DefaultVascEntry();
|
||||
entry.setId("test1");
|
||||
entry.setBackendId("testBackend");
|
||||
|
||||
DefaultVascFrontendData vascFrontendData = new DefaultVascFrontendData();
|
||||
vascFrontendData.setVascBackend(data);
|
||||
vascFrontendData.setVascBackend(c.getVascBackendControllerResolver().getVascBackendController().getVascBackendById("testBackend"));
|
||||
|
||||
DefaultVascEntryResourceResolver vascEntryResourceResolver = new DefaultVascEntryResourceResolver();
|
||||
VascI18nTextValue vascEntryResourceResolver = new VascI18nTextValue();// new DefaultVascEntryResourceResolver();
|
||||
vascFrontendData.setVascEntryResourceResolver(vascEntryResourceResolver);
|
||||
|
||||
DefaultVascFrontendHelper vascFrontendHelper = new DefaultVascFrontendHelper();
|
||||
vascFrontendData.setVascFrontendHelper(vascFrontendHelper);
|
||||
|
||||
entry.setVascFrontendData(vascFrontendData);
|
||||
entry.setId("test1");
|
||||
|
||||
entry.addRowAction(new AddRowAction());
|
||||
entry.addRowAction(new EditRowAction());
|
||||
|
|
@ -129,21 +128,11 @@ public class TestTable {
|
|||
|
||||
VascEntryField field = new DefaultVascEntryField("name");
|
||||
field.setImage("/META-INF/images/silk/png/tick.png");
|
||||
try {
|
||||
field.setVascEntryFieldType(c.getVascEntryFieldTypeControllerResolver().getVascEntryFieldTypeController().getVascEntryFieldType("TextField"));
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
field.setVascEntryFieldValue(new BeanPropertyVascEntryFieldValue("name"));
|
||||
entry.addVascEntryField(field);
|
||||
|
||||
|
||||
field = new DefaultVascEntryField("description");
|
||||
field.setVascEntryFieldValue(new BeanPropertyVascEntryFieldValue("description"));
|
||||
entry.addVascEntryField(field);
|
||||
|
||||
|
||||
|
||||
field = new DefaultVascEntryField("active");
|
||||
field.setDefaultValue(true);
|
||||
entry.addVascEntryField(field);
|
||||
|
|
@ -153,8 +142,10 @@ public class TestTable {
|
|||
entry.addVascEntryField(field);
|
||||
|
||||
field = new DefaultVascEntryField("testModel");
|
||||
//field.setVascEntryFieldType(c.getVascEntryFieldTypeControllerResolver().getVascEntryFieldTypeController().getVascEntryFieldTypeById("TextField"));
|
||||
//field.getVascEntryFieldType()
|
||||
VascList list = new VascList();
|
||||
list.setVascSelectItemModel(data);
|
||||
list.setVascSelectItemModel((TestModelVascDataSource)c.getVascBackendControllerResolver().getVascBackendController().getVascBackendById("testBackend"));
|
||||
//field.setVascUIComponent(list);
|
||||
entry.addVascEntryField(field);
|
||||
|
||||
|
|
@ -168,11 +159,11 @@ public class TestTable {
|
|||
|
||||
printEntry(entry);
|
||||
DefaultVascBackedEntryFinalizer f = new DefaultVascBackedEntryFinalizer();
|
||||
entry = f.finalizeVascEntry(entry);
|
||||
entry = f.finalizeVascEntry(entry,c);
|
||||
printEntry(entry);
|
||||
|
||||
DefaultVascFrontendEntryFinalizer f2 = new DefaultVascFrontendEntryFinalizer();
|
||||
entry = f2.finalizeVascEntry(entry);
|
||||
entry = f2.finalizeVascEntry(entry,c);
|
||||
//printEntry(entry);
|
||||
|
||||
return entry;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,23 @@
|
|||
test = Dit is een test
|
||||
|
||||
|
||||
vasc.entry.test1.headerName = Test Entry 1
|
||||
vasc.entry.test1.headerDescription = De test omschrijving van deze entry
|
||||
vasc.entry.test1.headerImage = /META-INF/images/silk/png/tick.png
|
||||
|
||||
vasc.entry.test1.name.name = Naam
|
||||
vasc.entry.test1.name.description = De naam van het object
|
||||
vasc.entry.test1.description.name = Omschrijving
|
||||
vasc.entry.test1.description.description = De omschrijving van het object
|
||||
vasc.entry.test1.active.name = Aktief
|
||||
vasc.entry.test1.active.description = Is deze actief
|
||||
vasc.entry.test1.active.image = /META-INF/images/silk/png/tick.png
|
||||
vasc.entry.test1.date.name = Datum
|
||||
vasc.entry.test1.date.description = De datum om te testen
|
||||
vasc.entry.test1.testModel.name = Tests Models
|
||||
vasc.entry.test1.testModel.description = ddddd
|
||||
vasc.entry.test1.hexColor.name = Kleur
|
||||
vasc.entry.test1.hexColor.description = De kleur van omo power.
|
||||
|
||||
vasc.dialog.save.name = Opslaan
|
||||
vasc.dialog.save.tooltip = Het opslaan van de waardes.
|
||||
|
|
@ -12,8 +28,8 @@ vasc.dialog.cancel.name = Annuleren
|
|||
vasc.dialog.cancel.tooltip = Niet opslaan van de waardes.
|
||||
vasc.dialog.cancel.image = /META-INF/images/silk/png/cancel.png
|
||||
|
||||
|
||||
|
||||
vasc.dialog.delete.message = Wilt u deze {0} record verwijderen ?
|
||||
vasc.dialog.delete.title = Verwijderen
|
||||
|
||||
vasc.action.add.name = Toevoegen
|
||||
vasc.action.add.tooltip = Voegt een nieuw rij toe.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xtes xmlns="http://xtes.idcanet.com/eld/xtes-lang.eld"
|
||||
<vasc xmlns:v="http://vasc.idcanet.com/eld/vasc-lang.eld"
|
||||
xmlns:x4o="http://x4o.idcanet.com/eld/x4o-lang.eld"
|
||||
>
|
||||
<!--
|
||||
|
|
@ -15,7 +15,7 @@ Master
|
|||
- Details
|
||||
|
||||
-->
|
||||
|
||||
<!--
|
||||
<x4o:bean el.id="dataSource" bean.class="com.id.."/>
|
||||
<x4o:bean el.id="tableController" bean.class="com.id.."/>
|
||||
|
||||
|
|
@ -70,14 +70,9 @@ Master
|
|||
<v:viewController name="ldapUsers" primaryKey="user">
|
||||
<x4o:templateTag template="${posixUserSchema}"/>
|
||||
<x4o:templateTag template="${sambaUserSchema}">
|
||||
<!-- template overrideing -->
|
||||
<v:field name="sambaGroupType" v.defaultValue="3"/>
|
||||
</x4o:templateTag>
|
||||
|
||||
<!-- redifine overrideing -->
|
||||
<v:field name="sambaGroupType" v.defaultValue="4"/>
|
||||
|
||||
|
||||
</v:viewController>
|
||||
|
||||
<vasc:fieldType name="EmailField2">
|
||||
|
|
@ -90,7 +85,92 @@ Master
|
|||
<vasc:fieldHint key="timeout" default="200"/>
|
||||
</vasc:fieldType>
|
||||
|
||||
<v:viewController name="sudoers" primaryKey="user">
|
||||
-->
|
||||
|
||||
<v:entry id="test1" backendId="testBackend1">
|
||||
<v:field id="name"/>
|
||||
<v:field id="description"/>
|
||||
<v:field id="active"/>
|
||||
<v:field id="model" vascEntryFieldType="ListField" selectItemId="testBackend1"/>
|
||||
</v:entry>
|
||||
|
||||
<v:entry
|
||||
id="test2"
|
||||
name="iets"
|
||||
description="ietsdescrip"
|
||||
helpId="someHelpKey"
|
||||
image="imsdf"
|
||||
|
||||
headerName="sdf"
|
||||
headerDescription="sdfsdf"
|
||||
headerImage="sdfsdfsd"
|
||||
|
||||
primaryKeyFieldId="name"
|
||||
displayNameFieldId="name"
|
||||
|
||||
vascAdmimList="true"
|
||||
vascAdmimEdit="true"
|
||||
vascAdmimCreate="true"
|
||||
vascAdmimDelete="true"
|
||||
|
||||
backendId="testBackend1"
|
||||
>
|
||||
<v:field id="name"/>
|
||||
<v:field
|
||||
id="active"
|
||||
backendName="active"
|
||||
name="active"
|
||||
description="active"
|
||||
helpId="active"
|
||||
image="active"
|
||||
|
||||
defaultValue="true"
|
||||
|
||||
sizeList="styleClass"
|
||||
sizeEdit="styleClass"
|
||||
styleList="styleClass"
|
||||
styleEdit="styleClass"
|
||||
|
||||
choices=""
|
||||
|
||||
view="true"
|
||||
optional="false"
|
||||
|
||||
create="true"
|
||||
edit="true"
|
||||
editReadOnly="false"
|
||||
list="true"
|
||||
|
||||
rolesCreate="admin|manager"
|
||||
rolesEdit=""
|
||||
rolesEditReadOnly=""
|
||||
rolesList=""
|
||||
|
||||
vascEntryFieldType=""
|
||||
vascEntryFieldEventChannel=""
|
||||
>
|
||||
<v:intSizeValidator min="20"/>
|
||||
</v:field>
|
||||
|
||||
<v:fieldSet
|
||||
id="set1"
|
||||
vascEntryFieldIds="name,active"
|
||||
|
||||
name="set1"
|
||||
description="set1"
|
||||
helpId="set1"
|
||||
image="set1"
|
||||
|
||||
styleList="styleClass"
|
||||
styleEdit="styleClass"
|
||||
|
||||
collapsed="false"
|
||||
optional="false"
|
||||
/>
|
||||
</v:entry>
|
||||
|
||||
|
||||
<v:entry id="sudoers">
|
||||
<v:field name="user" backendName="cn" readOnly="true"/>
|
||||
<v:field name="description" backendName="description">
|
||||
<v:roles edit="admin" list="all"/>
|
||||
|
|
@ -123,21 +203,16 @@ Master
|
|||
<v:link fieldName="gidNumber" viewController="ldapGroups" parameterName="group_key,${baseDn}"/>
|
||||
|
||||
<v:detail fieldName="gidNumber" detailController="${ldapGroups}"/>
|
||||
|
||||
<!-- default are oke here
|
||||
<v:createView allField="true"/>
|
||||
<v:editView allField="true" inverse="true">
|
||||
<v:fieldName name="description"/>
|
||||
</v:editView>
|
||||
-->
|
||||
|
||||
|
||||
<v:ldapBackend ldapConnection="${sudoers}">
|
||||
<x4o:property name="list_filter">(&(objectClass=sudoRole))</x4o:property>
|
||||
<x4o:property name="delete">${baseDn},cn=%s</x4o:property>
|
||||
<x4o:property name="new_classes">sudoRole,top</x4o:property>
|
||||
</v:ldapBackend>
|
||||
</v:viewController>
|
||||
</v:entry>
|
||||
|
||||
<!--
|
||||
<jsf-vasc:viewManager controller="${sudoers}">
|
||||
|
||||
</jsf-vasc:viewManager>
|
||||
|
|
@ -183,7 +258,7 @@ Master
|
|||
<view>
|
||||
|
||||
</view>
|
||||
|
||||
-->
|
||||
|
||||
|
||||
<!--
|
||||
|
|
@ -191,7 +266,7 @@ Master
|
|||
# Convert from xml -> csv and html or xitext
|
||||
</xslt>
|
||||
-->
|
||||
|
||||
<!--
|
||||
<query name="limit">
|
||||
<sql>
|
||||
LIMIT <parameter name="limit"/>
|
||||
|
|
@ -219,11 +294,10 @@ Master
|
|||
<comment>Bla bla</comment>
|
||||
<comment>Also see this site http://www.google.com</comment>
|
||||
</query>
|
||||
|
||||
|
||||
<query name="testUsers2" type="hql">
|
||||
<x4o:property name="persistanceSession" value="sessionName"/>
|
||||
<sql>
|
||||
<!-- SOME COMMENT -->
|
||||
<include name="baseSelect"/>
|
||||
<parameter name="extra_where"/>
|
||||
AND role is in <parameter name="roles"/>
|
||||
|
|
@ -234,4 +308,5 @@ Master
|
|||
<parameterValue name="limit" value="15"/>
|
||||
<parameterValue name="offset" value="25"/>
|
||||
</query>
|
||||
</xtes>
|
||||
-->
|
||||
</vasc>
|
||||
Loading…
Add table
Add a link
Reference in a new issue