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

Merge remote branch 'upstream/master' into PM-1072

Browse Source
This commit is contained in:
dheeyi
2015-05-15 11:04:44 -04:00
parent caab76e1a3 3904a6534b
commit f3779a98b4
37 changed files with 226 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/class.dashletProcessMakerEnterprise.php
View File

@@ -115,18 +115,6 @@ class dashletProcessMakerEnterprise implements DashletInterface
<div id=\"container\">
<div id=\"page1\">
<div class=\"icon\">
<a href=\"http://processmaker.com/workflow-inbox-and-bpm-inbox\" target=\"_blank\"><img src=\"/images/dashlets/enterprise_list_builder.png\" /></a>
</div>
<div class=\"description\">
<a href=\"http://processmaker.com/workflow-inbox-and-bpm-inbox\" target=\"_blank\">Custom Case List Builder</a>
<br />
Allows an admin to setup custom column views inside a user's cases boxes (inbox, draft, sent, etc). &nbsp;Information from report tables or Dynaforms can then be displayed in the columns making the inbox experience more relevent and useful to the user.
<br />
<a href=\"http://processmaker.com/workflow-inbox-and-bpm-inbox\" target=\"_blank\">Read More&gt;&gt;</a>
</div>
<div class=\"clearf\"></div>
<div class=\"icon\">
<a href=\"http://processmaker.com/bpm-ldap-and-bpm-active-directory\" target=\"_blank\"><img src=\"/images/dashlets/enterprise_ldap.png\" /></a>
</div>

6
workflow/engine/classes/class.license.app.php
View File

@@ -420,9 +420,11 @@ class license_application extends padl
$DATA = $this->_unwrap_license($dat_str);
if (is_array($DATA)) {
# missing / incorrect id therefore it has been tampered with
if ($DATA['ID'] != G::encryptOld($this->ID1)) {
/*
*Disable to accept licenses from other workspaces
*if ($DATA['ID'] != G::encryptOld($this->ID1)) {
$DATA['RESULT'] = 'CORRUPT';
}
}*/
if ($this->USE_TIME) {
# the license is being used before it's official start
if ($DATA['DATE']['START'] > time() + $this->START_DIF) {

5
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -429,8 +429,8 @@ class PMPluginRegistry
$plugins = array ();
$namePlugin = array ();
foreach ($files as $f) {
//if (preg_match("/^([\w\.]*).ini$/", $f["filename"], $matches)) {
if (preg_match( "/^(.*pluginConfig)\.ini$/", $f["filename"], $matches )) {
if (preg_match("/^([\w\.]*).ini$/", $f["filename"], $matches)) {
//if (preg_match( "/^(.*pluginConfig)\.ini$/", $f["filename"], $matches )) {
$plugins[] = $matches[1];
}
if (preg_match( "/^.*($pluginName)\.php$/", $f["filename"], $matches )) {
@@ -485,7 +485,6 @@ class PMPluginRegistry
*/
$res = $tar->extract( PATH_PLUGINS );
if (! file_exists( PATH_PLUGINS . $pluginFile )) {
throw (new Exception( "File \"$pluginFile\" doesn't exist" ));
}

2
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2820,7 +2820,7 @@ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendM
function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})")
{
if (isset($suffix) && $suffix == "") {
$suffix = " Copy ({i})";
$suffix = " Copy({i})";
}
$newIndex = $index;

4
workflow/engine/classes/class.wsBase.php
View File

@@ -1187,7 +1187,7 @@ class wsBase
$mktimeDueDate = 0;
if (! empty( $dueDate )) {
if (! empty( $dueDate ) && $dueDate != 'null' && $dueDate) {
if (! preg_match( "/^(\d{4})-(\d{2})-(\d{2})$/", $dueDate, $arrayMatch )) {
$result = new wsCreateUserResponse( - 1, G::loadTranslation( "ID_INVALID_DATA" ) . " $dueDate", null );
@@ -1199,7 +1199,7 @@ class wsBase
$mktimeDueDate = mktime( 0, 0, 0, date( "m" ), date( "d" ), date( "Y" ) + 1 );
}
if (! empty( $status )) {
if (! empty( $status ) && $status != 'null' && $status) {
if ($status != "ACTIVE" && $status != "INACTIVE" && $status != "VACATION") {
$result = new wsCreateUserResponse( - 1, G::loadTranslation( "ID_INVALID_DATA" ) . " $status", null );

2
workflow/engine/classes/model/AddonsStore.php
View File

@@ -41,7 +41,7 @@ class AddonsStore extends BaseAddonsStore
$criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
$criteria->addSelectColumn("*");
$criteria->add(AddonsStorePeer::STORE_TYPE, "license", Criteria::EQUAL);
//$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
$criteria->add(AddonsStorePeer::STORE_ID, $licenseManager->id, Criteria::NOT_EQUAL);
foreach (AddonsStorePeer::doSelect($criteria) as $store) {
$store->clear();

8
workflow/engine/classes/model/Dashboard.php
View File

@@ -35,9 +35,10 @@ class Dashboard extends BaseDashboard
try {
if (!isset($data['DAS_UID'])) {
$dashboard = new Dashboard();
$data['DAS_UID'] = G::generateUniqueID();
$data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s');
$dashboard = new Dashboard();
$msg = 'Create ';
} else {
$msg = 'Update ';
@@ -46,8 +47,11 @@ class Dashboard extends BaseDashboard
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s');
if (isset($data['DAS_TITLE'])) {
$data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string");
}
$data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s');
$dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME);
if ($dashboard->validate()) {
$connection->begin();

4
workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php
View File

@@ -100,7 +100,7 @@ class ProcessMap
$tmpData[2] = $laneset['bou_y'];
$tmpData[3] = $laneset['bou_width'];
$tmpData[4] = $laneset['bou_height'];
$tmpData[5] = $laneset['dat_type'];
//$tmpData[5] = $laneset['dat_type'];
$tmpData[6] = $laneset['lns_name'];
$tmpData[7] = "";
$tmpData[8] = $laneset['lns_uid'];
@@ -399,7 +399,7 @@ class ProcessMap
$tt = explode('_', $figure[7]);
$this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0], $tt[0]);
} else {
$this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0], $figure[5]);
$this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0]);
}
break;
case 'bpmnLane':

4
workflow/engine/templates/admin/uxUsersList.js
View File

@@ -35,7 +35,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {
@@ -353,7 +353,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

9
workflow/engine/templates/app/main.js
View File

@@ -213,13 +213,18 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU
growMin: 40,
growMax: 80,
maxLengthText : 500,
allowBlank :true,
allowBlank :false,
selectOnFocus :true,
enableKeyEvents: true,
listeners : {
scope : this,
keyup : updateTextCtr,
keydown: updateTextCtr
keydown: updateTextCtr,
'change': function(field, newVal, oldVal){
var textAreaValue = newVal.replace(/^\s+/,'').replace(/\s+$/,'');
field.setValue(textAreaValue.trim());
Ext.getCmp('caseNoteText').focus(false, 200);
}
}
})
],

2
workflow/engine/templates/authSources/authSourcesList.js
View File

@@ -107,7 +107,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/cases/casesSchedulerLog.js
View File

@@ -61,7 +61,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/emailServer/emailServer.js
View File

@@ -932,7 +932,7 @@ emailServer.application = {
var txtSearch = new Ext.form.TextField({
id: "txtSearch",
emptyText: _("ID_ENTER_SEARCH_TERM"),
emptyText: _("ID_EMPTY_SEARCH"),
width: 150,
allowBlank: true,

3
workflow/engine/templates/enterprise/addonsStore.js
View File

@@ -472,7 +472,8 @@ Ext.onReady(function() {
method: "POST"
}),
baseParams: {
"action": "addonsList"
"action": "addonsList",
"force" : true
},
//url: "addonsStoreAction?action=addonsList",

2
workflow/engine/templates/groups/groupsList.js
View File

@@ -107,7 +107,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/pmTables/data.js
View File

@@ -90,7 +90,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

4
workflow/engine/templates/pmTables/edit.js
View File

@@ -568,7 +568,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 110,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {
@@ -583,7 +583,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 110,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

6
workflow/engine/templates/pmTables/editReport.js
View File

@@ -172,7 +172,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 220,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {
@@ -696,7 +696,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
ctCls:'pm_search_text_field',
allowBlank: true,
width: 110,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {
@@ -711,7 +711,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
ctCls:'pm_search_text_field',
allowBlank: true,
width: 110,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/pmTables/list.js
View File

@@ -164,7 +164,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/processCategory/processCategoryList.js
View File

@@ -100,7 +100,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/processes/main.js
View File

@@ -360,7 +360,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

4
workflow/engine/templates/reportTables/edit.js
View File

@@ -367,7 +367,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 110,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {
@@ -382,7 +382,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 110,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/reportTables/main.js
View File

@@ -129,7 +129,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/roles/rolesList.js
View File

@@ -114,7 +114,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

4
workflow/engine/templates/services/login_getStarted.html
View File

@@ -101,10 +101,8 @@
<span class="cNeg">Password:</span><span class="cLow"> {pass}</span><br><br>
<p style="text-align: justify;"><span class="cLow-min">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at <a target="_blank" href="http://www.processmaker.com/tutorials">http://www.processmaker.com/tutorials/</a></span></p>
<b><span class="cLow">Other Resources:</span></b><br/><br/>
<b><span class="cLow">Other Resources:</span></b><br/>
<span class="cLow"><a target="_blank" href="http://wiki.processmaker.com">PM Wiki </a>- Manuals</span><br/>
<span class="cLow"><a target="_blank" href="http://forum.processmaker.com">PM Forum </a>- Ask Questions</span><br/><br/>
<p style="text-align: justify;"><span class="cLow-min">We hope you enjoy using ProcessMaker. For more information about our enterprise support and consulting services <a target="_blank" href="http://www.processmaker.com/contact-us">contact us.</a></span></p>

2
workflow/engine/templates/setup/calendarList.js
View File

@@ -108,7 +108,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/setup/skinList.js
View File

@@ -104,7 +104,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 150,
emptyText: _('ID_ENTER_SEARCH_TERM'),
emptyText: _('ID_EMPTY_SEARCH'),
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

2
workflow/engine/templates/strategicDashboard/dashboardList.js
View File

@@ -311,7 +311,7 @@ newDashboard = function() {
//Edit Dashboard Action
editDashboard = function() {
var rowSelected = infoGrid.getSelectionModel().getSelected();
if (rowSelected){
if (rowSelected && rowSelected.data.DAS_STATUS == 1 ){
location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID;
}
};

2
workflow/engine/templates/users/usersList.js
View File

@@ -140,7 +140,7 @@ Ext.onReady(function(){
ctCls:'pm_search_text_field',
allowBlank: true,
width: 100,
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {

23
workflow/engine/xmlform/cases/cases_Scheduler_Options.xml
View File

@@ -12,6 +12,29 @@
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder) {
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
function $_GET(q,s) {
s = (s) ? s : self.location.search;
var re = new RegExp('&'+q+'=([^&]*)','i');

23
workflow/engine/xmlform/dbConnections/dbConnections_Options.xml
View File

@@ -8,6 +8,27 @@
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<SEARCH_FILTER_FORM type="private"/>
<js type="javascript" replaceTags="1"><![CDATA[
var currentPagedTable = @#PAGED_TABLE_ID;
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder) {
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
var currentPagedTable = @#PAGED_TABLE_ID;
]]></js>
</dynaForm>

21
workflow/engine/xmlform/dynaforms/dynaforms_Options.xml
View File

@@ -13,6 +13,27 @@
<dynaformsFlatEditor type="private" defaultValue="../dynaforms/dynaforms_FlatEditor"/>
<dynaformsDelete type="private" defaultValue="../dynaforms/dynaforms_Delete"/>
<js type="javascript" replaceTags="1"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder) {
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
function dynaformAdd(){
popupWindow("@G::LoadTranslation(ID_NEW_DYNAFORM)", "@G::encryptlink(@#dynaformsChoseType)?PRO_UID=@%PRO_UID" , 500, 225);
//popupWindow('@G::LoadTranslation(ID_NEW_DYNAFORM)', '@G::encryptlink(@#dynaformsNewPlugin)?PRO_UID=@%PRO_UID' , 500, 350);

21
workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
View File

@@ -9,6 +9,27 @@
<inputdocsEdit type="private" defaultValue="../inputdocs/inputdocs_Edit"/>
<inputdocsDelete type="private" defaultValue="../inputdocs/inputdocs_Delete"/>
<js type="javascript" replaceTags="1"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder) {
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
var currentPagedTable = @#PAGED_TABLE_ID;
function inputdocsAdd(){//alert('@G::encryptlink(@#inputdocsEdit)?PRO_UID=@%PRO_UID');
popupWindow('@G::LoadTranslation(ID_NEW_INPUTDOCS)', '@G::encryptlink(@#inputdocsEdit)?PRO_UID=@%PRO_UID' , 500, 410);

21
workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
View File

@@ -1,6 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm type="xmlmenu"><MNU_ADD type="link" value="" link="#" onclick="outputdocsAdd(); return false;" colAlign="left" colWidth="100"><en><![CDATA[New]]></en></MNU_ADD><PAGED_TABLE_ID type="private"/><PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/><PRO_UID type="private"/><![CDATA[>
]]><outputdocs_New type="private" defaultValue="../outputdocs/outputdocs_New"/><outputdocs_Edit type="private" defaultValue="../outputdocs/outputdocs_Edit"/><outputdocs_Properties type="private" defaultValue="../outputdocs/outputdocs_Properties"/><outputdocs_Delete type="private" defaultValue="../outputdocs/outputdocs_Delete"/><js type="javascript" replaceTags="1"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder) {
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
var currentPagedTable = @#PAGED_TABLE_ID;
var outputdocsEditor;

23
workflow/engine/xmlform/processes/processes_availableProcessesUserOptions.xml
View File

@@ -4,5 +4,28 @@
>
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder){
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
]]></JS>
</dynaForm>

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

@@ -19,6 +19,27 @@
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript" replaceTags="1"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder){
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
var windowWidth = 600;
var windowHeight = 460;

22
workflow/engine/xmlform/users/users_Searchx.xml
View File

@@ -5,5 +5,27 @@
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript"><![CDATA[
add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
function add_placeholder (id, placeholder){
var el = document.getElementById(id);
el.placeholder = placeholder;
el.onfocus = function () {
if(this.value == this.placeholder) {
this.value = '';
el.style.cssText = '';
}
};
el.onblur = function () {
if(this.value.length == 0) {
this.value = this.placeholder;
el.style.cssText = 'color:#A9A9A9;';
}
};
el.onblur();
}
]]></JS>
</dynaForm>