Merge remote branch 'upstream/master' into PM-1072
This commit is contained in:
@@ -115,18 +115,6 @@ class dashletProcessMakerEnterprise implements DashletInterface
|
|||||||
|
|
||||||
<div id=\"container\">
|
<div id=\"container\">
|
||||||
<div id=\"page1\">
|
<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). 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>></a>
|
|
||||||
</div>
|
|
||||||
<div class=\"clearf\"></div>
|
|
||||||
|
|
||||||
<div class=\"icon\">
|
<div class=\"icon\">
|
||||||
<a href=\"http://processmaker.com/bpm-ldap-and-bpm-active-directory\" target=\"_blank\"><img src=\"/images/dashlets/enterprise_ldap.png\" /></a>
|
<a href=\"http://processmaker.com/bpm-ldap-and-bpm-active-directory\" target=\"_blank\"><img src=\"/images/dashlets/enterprise_ldap.png\" /></a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -420,9 +420,11 @@ class license_application extends padl
|
|||||||
$DATA = $this->_unwrap_license($dat_str);
|
$DATA = $this->_unwrap_license($dat_str);
|
||||||
if (is_array($DATA)) {
|
if (is_array($DATA)) {
|
||||||
# missing / incorrect id therefore it has been tampered with
|
# 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';
|
$DATA['RESULT'] = 'CORRUPT';
|
||||||
}
|
}*/
|
||||||
if ($this->USE_TIME) {
|
if ($this->USE_TIME) {
|
||||||
# the license is being used before it's official start
|
# the license is being used before it's official start
|
||||||
if ($DATA['DATE']['START'] > time() + $this->START_DIF) {
|
if ($DATA['DATE']['START'] > time() + $this->START_DIF) {
|
||||||
|
|||||||
@@ -429,8 +429,8 @@ class PMPluginRegistry
|
|||||||
$plugins = array ();
|
$plugins = array ();
|
||||||
$namePlugin = array ();
|
$namePlugin = array ();
|
||||||
foreach ($files as $f) {
|
foreach ($files as $f) {
|
||||||
//if (preg_match("/^([\w\.]*).ini$/", $f["filename"], $matches)) {
|
if (preg_match("/^([\w\.]*).ini$/", $f["filename"], $matches)) {
|
||||||
if (preg_match( "/^(.*pluginConfig)\.ini$/", $f["filename"], $matches )) {
|
//if (preg_match( "/^(.*pluginConfig)\.ini$/", $f["filename"], $matches )) {
|
||||||
$plugins[] = $matches[1];
|
$plugins[] = $matches[1];
|
||||||
}
|
}
|
||||||
if (preg_match( "/^.*($pluginName)\.php$/", $f["filename"], $matches )) {
|
if (preg_match( "/^.*($pluginName)\.php$/", $f["filename"], $matches )) {
|
||||||
@@ -485,7 +485,6 @@ class PMPluginRegistry
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
$res = $tar->extract( PATH_PLUGINS );
|
$res = $tar->extract( PATH_PLUGINS );
|
||||||
|
|
||||||
if (! file_exists( PATH_PLUGINS . $pluginFile )) {
|
if (! file_exists( PATH_PLUGINS . $pluginFile )) {
|
||||||
throw (new Exception( "File \"$pluginFile\" doesn't exist" ));
|
throw (new Exception( "File \"$pluginFile\" doesn't exist" ));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2820,7 +2820,7 @@ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendM
|
|||||||
function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})")
|
function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})")
|
||||||
{
|
{
|
||||||
if (isset($suffix) && $suffix == "") {
|
if (isset($suffix) && $suffix == "") {
|
||||||
$suffix = " Copy ({i})";
|
$suffix = " Copy({i})";
|
||||||
}
|
}
|
||||||
|
|
||||||
$newIndex = $index;
|
$newIndex = $index;
|
||||||
|
|||||||
@@ -1187,7 +1187,7 @@ class wsBase
|
|||||||
|
|
||||||
$mktimeDueDate = 0;
|
$mktimeDueDate = 0;
|
||||||
|
|
||||||
if (! empty( $dueDate )) {
|
if (! empty( $dueDate ) && $dueDate != 'null' && $dueDate) {
|
||||||
if (! preg_match( "/^(\d{4})-(\d{2})-(\d{2})$/", $dueDate, $arrayMatch )) {
|
if (! preg_match( "/^(\d{4})-(\d{2})-(\d{2})$/", $dueDate, $arrayMatch )) {
|
||||||
$result = new wsCreateUserResponse( - 1, G::loadTranslation( "ID_INVALID_DATA" ) . " $dueDate", null );
|
$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 );
|
$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") {
|
if ($status != "ACTIVE" && $status != "INACTIVE" && $status != "VACATION") {
|
||||||
$result = new wsCreateUserResponse( - 1, G::loadTranslation( "ID_INVALID_DATA" ) . " $status", null );
|
$result = new wsCreateUserResponse( - 1, G::loadTranslation( "ID_INVALID_DATA" ) . " $status", null );
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class AddonsStore extends BaseAddonsStore
|
|||||||
$criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
|
$criteria = new Criteria(AddonsStorePeer::DATABASE_NAME);
|
||||||
$criteria->addSelectColumn("*");
|
$criteria->addSelectColumn("*");
|
||||||
$criteria->add(AddonsStorePeer::STORE_TYPE, "license", Criteria::EQUAL);
|
$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) {
|
foreach (AddonsStorePeer::doSelect($criteria) as $store) {
|
||||||
$store->clear();
|
$store->clear();
|
||||||
|
|||||||
@@ -35,9 +35,10 @@ class Dashboard extends BaseDashboard
|
|||||||
try {
|
try {
|
||||||
|
|
||||||
if (!isset($data['DAS_UID'])) {
|
if (!isset($data['DAS_UID'])) {
|
||||||
|
|
||||||
|
$dashboard = new Dashboard();
|
||||||
$data['DAS_UID'] = G::generateUniqueID();
|
$data['DAS_UID'] = G::generateUniqueID();
|
||||||
$data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s');
|
$data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s');
|
||||||
$dashboard = new Dashboard();
|
|
||||||
$msg = 'Create ';
|
$msg = 'Create ';
|
||||||
} else {
|
} else {
|
||||||
$msg = 'Update ';
|
$msg = 'Update ';
|
||||||
@@ -46,8 +47,11 @@ class Dashboard extends BaseDashboard
|
|||||||
|
|
||||||
G::LoadSystem('inputfilter');
|
G::LoadSystem('inputfilter');
|
||||||
$filter = new InputFilter();
|
$filter = new InputFilter();
|
||||||
|
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');
|
$data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s');
|
||||||
$data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string");
|
|
||||||
$dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME);
|
$dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME);
|
||||||
if ($dashboard->validate()) {
|
if ($dashboard->validate()) {
|
||||||
$connection->begin();
|
$connection->begin();
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ class ProcessMap
|
|||||||
$tmpData[2] = $laneset['bou_y'];
|
$tmpData[2] = $laneset['bou_y'];
|
||||||
$tmpData[3] = $laneset['bou_width'];
|
$tmpData[3] = $laneset['bou_width'];
|
||||||
$tmpData[4] = $laneset['bou_height'];
|
$tmpData[4] = $laneset['bou_height'];
|
||||||
$tmpData[5] = $laneset['dat_type'];
|
//$tmpData[5] = $laneset['dat_type'];
|
||||||
$tmpData[6] = $laneset['lns_name'];
|
$tmpData[6] = $laneset['lns_name'];
|
||||||
$tmpData[7] = "";
|
$tmpData[7] = "";
|
||||||
$tmpData[8] = $laneset['lns_uid'];
|
$tmpData[8] = $laneset['lns_uid'];
|
||||||
@@ -399,7 +399,7 @@ class ProcessMap
|
|||||||
$tt = explode('_', $figure[7]);
|
$tt = explode('_', $figure[7]);
|
||||||
$this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0], $tt[0]);
|
$this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0], $tt[0]);
|
||||||
} else {
|
} 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;
|
break;
|
||||||
case 'bpmnLane':
|
case 'bpmnLane':
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
@@ -353,7 +353,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -213,13 +213,18 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU
|
|||||||
growMin: 40,
|
growMin: 40,
|
||||||
growMax: 80,
|
growMax: 80,
|
||||||
maxLengthText : 500,
|
maxLengthText : 500,
|
||||||
allowBlank :true,
|
allowBlank :false,
|
||||||
selectOnFocus :true,
|
selectOnFocus :true,
|
||||||
enableKeyEvents: true,
|
enableKeyEvents: true,
|
||||||
listeners : {
|
listeners : {
|
||||||
scope : this,
|
scope : this,
|
||||||
keyup : updateTextCtr,
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -932,7 +932,7 @@ emailServer.application = {
|
|||||||
var txtSearch = new Ext.form.TextField({
|
var txtSearch = new Ext.form.TextField({
|
||||||
id: "txtSearch",
|
id: "txtSearch",
|
||||||
|
|
||||||
emptyText: _("ID_ENTER_SEARCH_TERM"),
|
emptyText: _("ID_EMPTY_SEARCH"),
|
||||||
width: 150,
|
width: 150,
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
|
|
||||||
|
|||||||
@@ -472,7 +472,8 @@ Ext.onReady(function() {
|
|||||||
method: "POST"
|
method: "POST"
|
||||||
}),
|
}),
|
||||||
baseParams: {
|
baseParams: {
|
||||||
"action": "addonsList"
|
"action": "addonsList",
|
||||||
|
"force" : true
|
||||||
},
|
},
|
||||||
|
|
||||||
//url: "addonsStoreAction?action=addonsList",
|
//url: "addonsStoreAction?action=addonsList",
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -568,7 +568,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 110,
|
width: 110,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
@@ -583,7 +583,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 110,
|
width: 110,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 220,
|
width: 220,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
@@ -696,7 +696,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 110,
|
width: 110,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
@@ -711,7 +711,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 110,
|
width: 110,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -367,7 +367,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 110,
|
width: 110,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
@@ -382,7 +382,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 110,
|
width: 110,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -101,10 +101,8 @@
|
|||||||
<span class="cNeg">Password:</span><span class="cLow"> {pass}</span><br><br>
|
<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>
|
<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://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/>
|
<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>
|
<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>
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),
|
emptyText: _('ID_EMPTY_SEARCH'),
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -311,7 +311,7 @@ newDashboard = function() {
|
|||||||
//Edit Dashboard Action
|
//Edit Dashboard Action
|
||||||
editDashboard = function() {
|
editDashboard = function() {
|
||||||
var rowSelected = infoGrid.getSelectionModel().getSelected();
|
var rowSelected = infoGrid.getSelectionModel().getSelected();
|
||||||
if (rowSelected){
|
if (rowSelected && rowSelected.data.DAS_STATUS == 1 ){
|
||||||
location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID;
|
location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ Ext.onReady(function(){
|
|||||||
ctCls:'pm_search_text_field',
|
ctCls:'pm_search_text_field',
|
||||||
allowBlank: true,
|
allowBlank: true,
|
||||||
width: 100,
|
width: 100,
|
||||||
emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
|
emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
|
||||||
listeners: {
|
listeners: {
|
||||||
specialkey: function(f,e){
|
specialkey: function(f,e){
|
||||||
if (e.getKey() == e.ENTER) {
|
if (e.getKey() == e.ENTER) {
|
||||||
|
|||||||
@@ -12,6 +12,29 @@
|
|||||||
<PAGED_TABLE_ID type="private"/>
|
<PAGED_TABLE_ID type="private"/>
|
||||||
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
||||||
<JS type="javascript"><![CDATA[
|
<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) {
|
function $_GET(q,s) {
|
||||||
s = (s) ? s : self.location.search;
|
s = (s) ? s : self.location.search;
|
||||||
var re = new RegExp('&'+q+'=([^&]*)','i');
|
var re = new RegExp('&'+q+'=([^&]*)','i');
|
||||||
|
|||||||
@@ -8,6 +8,27 @@
|
|||||||
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
||||||
<SEARCH_FILTER_FORM type="private"/>
|
<SEARCH_FILTER_FORM type="private"/>
|
||||||
<js type="javascript" replaceTags="1"><![CDATA[
|
<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>
|
]]></js>
|
||||||
</dynaForm>
|
</dynaForm>
|
||||||
|
|||||||
@@ -13,6 +13,27 @@
|
|||||||
<dynaformsFlatEditor type="private" defaultValue="../dynaforms/dynaforms_FlatEditor"/>
|
<dynaformsFlatEditor type="private" defaultValue="../dynaforms/dynaforms_FlatEditor"/>
|
||||||
<dynaformsDelete type="private" defaultValue="../dynaforms/dynaforms_Delete"/>
|
<dynaformsDelete type="private" defaultValue="../dynaforms/dynaforms_Delete"/>
|
||||||
<js type="javascript" replaceTags="1"><![CDATA[
|
<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(){
|
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(@#dynaformsChoseType)?PRO_UID=@%PRO_UID" , 500, 225);
|
||||||
//popupWindow('@G::LoadTranslation(ID_NEW_DYNAFORM)', '@G::encryptlink(@#dynaformsNewPlugin)?PRO_UID=@%PRO_UID' , 500, 350);
|
//popupWindow('@G::LoadTranslation(ID_NEW_DYNAFORM)', '@G::encryptlink(@#dynaformsNewPlugin)?PRO_UID=@%PRO_UID' , 500, 350);
|
||||||
|
|||||||
@@ -9,6 +9,27 @@
|
|||||||
<inputdocsEdit type="private" defaultValue="../inputdocs/inputdocs_Edit"/>
|
<inputdocsEdit type="private" defaultValue="../inputdocs/inputdocs_Edit"/>
|
||||||
<inputdocsDelete type="private" defaultValue="../inputdocs/inputdocs_Delete"/>
|
<inputdocsDelete type="private" defaultValue="../inputdocs/inputdocs_Delete"/>
|
||||||
<js type="javascript" replaceTags="1"><![CDATA[
|
<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 currentPagedTable = @#PAGED_TABLE_ID;
|
||||||
function inputdocsAdd(){//alert('@G::encryptlink(@#inputdocsEdit)?PRO_UID=@%PRO_UID');
|
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);
|
popupWindow('@G::LoadTranslation(ID_NEW_INPUTDOCS)', '@G::encryptlink(@#inputdocsEdit)?PRO_UID=@%PRO_UID' , 500, 410);
|
||||||
|
|||||||
@@ -1,6 +1,27 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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[>
|
<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[
|
]]><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 currentPagedTable = @#PAGED_TABLE_ID;
|
||||||
var outputdocsEditor;
|
var outputdocsEditor;
|
||||||
|
|
||||||
|
|||||||
@@ -4,5 +4,28 @@
|
|||||||
>
|
>
|
||||||
<PAGED_TABLE_ID type="private"/>
|
<PAGED_TABLE_ID type="private"/>
|
||||||
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
<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>
|
</dynaForm>
|
||||||
@@ -19,6 +19,27 @@
|
|||||||
<PAGED_TABLE_ID type="private"/>
|
<PAGED_TABLE_ID type="private"/>
|
||||||
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
||||||
<JS type="javascript" replaceTags="1"><![CDATA[
|
<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 windowWidth = 600;
|
||||||
var windowHeight = 460;
|
var windowHeight = 460;
|
||||||
|
|
||||||
|
|||||||
@@ -5,5 +5,27 @@
|
|||||||
|
|
||||||
<PAGED_TABLE_ID type="private"/>
|
<PAGED_TABLE_ID type="private"/>
|
||||||
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
|
<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>
|
</dynaForm>
|
||||||
Reference in New Issue
Block a user