fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.0-dev' of git.colosa.net:processmaker into 2.0-dev

Browse Source
This commit is contained in:
Fernando Ontiveros
2011-10-31 12:06:53 -04:00
parent ab5c367b1c 8fcd766c8c
commit aecbcd8d64
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/xmlform/triggers/triggers_Options.xml
View File

@@ -29,7 +29,8 @@
<triggerNewGoogleCreateEvent type="private" defaultValue="../triggers/triggers_CreateGoogleEvent"/> <triggerNewGoogleCreateEvent type="private" defaultValue="../triggers/triggers_CreateGoogleEvent"/>
<PAGED_TABLE_ID type="private"/> <PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript" replaceTags="1"> <JS type="javascript" replaceTags="1">
<![CDATA[ <![CDATA[

2
workflow/engine/xmlform/triggers/triggers_ShortList.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<dynaForm sqlConnection="" menu="triggers/triggers_Options" width="100%" rowsPerPage="12"> <dynaForm sqlConnection="" menu="triggers/triggers_Options" width="100%" rowsPerPage="12" searchBy="C2.CON_VALUE">
<TRI_UID type="hidden" showInTable="0"/> <TRI_UID type="hidden" showInTable="0"/>