fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Marco Antonio Nina
2013-01-23 09:54:46 -04:00
parent 4085fe1d42 65fd1c4f1a
commit 7ca223fe8c
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/methods/errors/error403.php
View File

@@ -75,7 +75,7 @@
<img src="images/pm.png" alt="twitter" id="twitter" />
<p id="twitter_text">
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-licensee" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-license" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
&#169; Copyright 2000 - 2012 Colosa, Inc. <a href= "http://www.colosa.com/" target="_blank"> www.colosa.com </a>
</p>
<!-- End Twitter -->

2
gulliver/methods/errors/error404.php
View File

@@ -75,7 +75,7 @@
<img src="images/pm.png" alt="twitter" id="twitter" />
<p id="twitter_text">
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-licensee" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-license" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
&#169; Copyright 2000 - 2012 Colosa, Inc. <a href= "http://www.colosa.com/" target="_blank"> www.colosa.com </a>
</p>
<!-- End Twitter -->

4
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -62,7 +62,7 @@ function getProcessList ()
if (1) {
foreach ($processList as $key => $processInfo) {
$tempTree['text'] = $key;
$tempTree['id'] = $key;
$tempTree['id'] = preg_replace('([^A-Za-z0-9])', '', $key);
$tempTree['cls'] = 'folder';
$tempTree['draggable'] = true;
$tempTree['optionType'] = "category";
@@ -79,7 +79,7 @@ function getProcessList ()
//print_r($processInfo);
$tempTreeChild['text'] = $keyChild; //ellipsis ( $keyChild, 50 );
//$tempTree['text']=$key;
$tempTreeChild['id'] = $keyChild;
$tempTreeChild['id'] = preg_replace('([^A-Za-z0-9 ()])', '', $keyChild);
$tempTreeChild['draggable'] = true;
$tempTreeChild['leaf'] = true;
$tempTreeChild['icon'] = '/images/icon.trigger.png';

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

@@ -162,7 +162,7 @@ Ext.onReady(function(){
allowBlank: true,
listeners:{
change: function(f,e){
this.setValue(this.getValue().toUpperCase());
this.setValue(this.getValue().replace(/\s/g,'').toUpperCase());
}
}
}