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

Merge remote branch 'upstream/master' into BUG-9087

Browse Source
This commit is contained in:
Hector Cortez
2012-06-13 11:28:21 -04:00
parent 21f000be20 3535c8fade
commit e0d178635b
33 changed files with 216 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/class.dynaformEditor.php
View File

@@ -265,6 +265,7 @@ class dynaformEditor extends WebResource
var DYNAFORM_URL="'.$Parameters['URL'].'";
leimnud.event.add(window,"load",function(){ loadEditor(); });
');
$oHeadPublisher->addScriptCode(' var jsMeta;');
G::RenderPage( "publish", 'blank' );
}
@@ -664,8 +665,12 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
* @param string $sCode
* @return array
*/
function set_javascript($A,$fieldName,$sCode)
function set_javascript($A,$fieldName,$sCode,$meta)
{
if ($fieldName == '___pm_boot_strap___') {
return 0;
}
$sCode = urldecode($sCode) ;
try {
$sCode = rtrim($sCode);
@@ -678,7 +683,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
G::LoadSystem('dynaformhandler');
$dynaform = new dynaFormHandler(PATH_DYNAFORM."{$file}.xml");
$dynaform->replace($fieldName, $fieldName, Array('type'=>'javascript', '#cdata'=>$sCode));
$dynaform->replace($fieldName, $fieldName, Array('type'=>'javascript', 'meta'=>$meta, '#cdata'=>$sCode));
return 0;
} catch(Exception $e) {

1
workflow/engine/classes/class.propelTable.php
View File

@@ -542,7 +542,6 @@ class propelTable
$template = PATH_CORE . 'templates' . PATH_SEP . $menu->type . '.html';
$menu->setValues($this->xmlForm->values);
$menu->setValues(array( 'PAGED_TABLE_ID' => $this->id ));
$menu->setValues(array( 'PAGED_TABLE_FAST_SEARCH' => $this->fastSearch ));
if (isset($filterForm->name)) {
$menu->setValues(array('SEARCH_FILTER_FORM' => $filterForm->name));
}

2
workflow/engine/js/cases/core/cases_Step.js
View File

@@ -182,7 +182,7 @@ var showProcessMap = function ()
scs.evalScript();
oLeyendsPanel = new leimnud.module.panel();
oLeyendsPanel.options = {
size :{w:160,h:140},
size :{w:160,h:155},
position:{x:((document.body.clientWidth * 95) / 100) - ((document.body.clientWidth * 95) / 100 - (((document.body.clientWidth * 95) / 100) - 160)),y:45,center:false},
title :G_STRINGS.ID_COLOR_LEYENDS,
theme :"processmaker",

7
workflow/engine/js/dynaformEditor/core/dynaformEditor.js
View File

@@ -165,10 +165,11 @@ var dynaformEditor={
{
var field=getField("JS_LIST","dynaforms_JSEditor");
var code=this.getJSCode();
var meta=jsMeta;
if (field.value)
{
var res = this.ajax.set_javascript(this.A,field.value, encodeURIComponent(code));
var res = this.ajax.set_javascript(this.A,field.value, encodeURIComponent(code), meta);
if (typeof(res["*message"])==="string")
{
G.alert(res["*message"]);
@@ -462,7 +463,7 @@ var dynaformEditor={
if( field.options[j].value == '___pm_boot_strap___' ){
field.remove(j);
}
}
}
this.currentJS=field.value;
var res=this.ajax.get_javascripts(this.A,field.value);
if(field.value == ''){

11
workflow/engine/js/dynaforms/dynaforms_fieldsHandler.js
View File

@@ -90,9 +90,11 @@
//alert( "Data Saved: " + httpResponse );
}
});
fieldsHandlerSaveHidden();
}
function fieldsHandlerSaveHidden(){
var responseMeta;
e = $('input:checkbox');
hidden_elements = '';
for(i=0; i<e.length; i++){
@@ -105,11 +107,14 @@
$.ajax({
type: "POST",
url: "fieldsHandlerAjax",
async: false,
data: "request=saveHidden&hidden="+hidden_elements,
success: function(httpResponse){
//alert( "Data Saved: " + httpResponse );
}
});
responseMeta = httpResponse;
}
});
return responseMeta;
}
function backImage(oImg,p){

2
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -275,7 +275,7 @@ class Ajax
oLeyendsPanel = new leimnud.module.panel();
oLeyendsPanel.options = {
size :{w:160,h:140},
size :{w:160,h:155},
position:{x:((document.body.clientWidth * 95) / 100) - ((document.body.clientWidth * 95) / 100 - (((document.body.clientWidth * 95) / 100) - 160)),y:45,center:false},
title :G_STRINGS.ID_COLOR_LEYENDS,
theme :"processmaker",

2
workflow/engine/methods/dynaforms/dynaforms_Editor.php
View File

@@ -90,4 +90,4 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
$editor->_setUseTemporalCopy(true);
$editor->_render();
?>
?>

5
workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
View File

@@ -88,8 +88,9 @@
if( $o->nodeExists('___pm_boot_strap___') ){
$o->remove('___pm_boot_strap___');
}
$o->add('___pm_boot_strap___', Array('type'=>'javascript', "meta"=>G::encrypt($hidden_items_tmp, 'dynafieldsHandler')), "/*$msg*/ $hStr");
$metaEncrypt = G::encrypt($hidden_items_tmp, 'dynafieldsHandler');
$o->add('___pm_boot_strap___', Array('type'=>'javascript', "meta"=>$metaEncrypt), "/*$msg*/ $hStr");
echo $metaEncrypt;
} else { //we must to remove the boot strap node;
$o->remove('___pm_boot_strap___');
}

53
workflow/engine/methods/users/usersAjax.php
View File

@@ -511,5 +511,58 @@ switch($_POST['action'])
}
print(G::json_encode($rowsCasesMenu));
break;
case 'testPassword';
require_once 'classes/model/UsersProperties.php';
$oUserProperty = new UsersProperties();
$aFields = array();
$color = '';
$img = '';
$dateNow = date('Y-m-d H:i:s');
$aErrors = $oUserProperty->validatePassword($_POST['PASSWORD_TEXT'], $dateNow, $dateNow);
if (!empty($aErrors)) {
$img = '/images/delete.png';
$color = 'red';
if (!defined('NO_DISPLAY_USERNAME')) {
define('NO_DISPLAY_USERNAME', 1);
}
$aFields = array();
$aFields['DESCRIPTION'] = G::LoadTranslation('ID_POLICY_ALERT').':<br />';
foreach ($aErrors as $sError) {
switch ($sError) {
case 'ID_PPP_MINIMUM_LENGTH':
$aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MINIMUM_LENGTH . '<br />';
$aFields[substr($sError, 3)] = PPP_MINIMUM_LENGTH;
break;
case 'ID_PPP_MAXIMUM_LENGTH':
$aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).': ' . PPP_MAXIMUM_LENGTH . '<br />';
$aFields[substr($sError, 3)] = PPP_MAXIMUM_LENGTH;
break;
case 'ID_PPP_EXPIRATION_IN':
$aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).' ' . PPP_EXPIRATION_IN . ' ' . G::LoadTranslation('ID_DAYS') . '<br />';
$aFields[substr($sError, 3)] = PPP_EXPIRATION_IN;
break;
default:
$aFields['DESCRIPTION'] .= ' - ' . G::LoadTranslation($sError).'<br />';
$aFields[substr($sError, 3)] = 1;
break;
}
}
$aFields['DESCRIPTION'] .= G::LoadTranslation('ID_PLEASE_CHANGE_PASSWORD_POLICY') . '</span>';
$aFields['STATUS'] = false;
} else {
$color = 'green';
$img = '/images/dialog-ok-apply.png';
$aFields['DESCRIPTION'] .= G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . '</span>';
$aFields['STATUS'] = true;
}
$span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
$gif = '<img width="13" height="13" border="0" src="' . $img . '">';
$aFields['DESCRIPTION'] = $span . $gif . $aFields['DESCRIPTION'];
print(G::json_encode($aFields));
break;
}

2
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -23,7 +23,7 @@
<table class="x-pm-headerbar">
<tr>
<td width="50%" valign="middle">
<img src="{$logo_company}" width="180" height="24"/>
<img src="{$logo_company}" width="250" height="40"/>
</td>
<td align="right" valign="top">

1
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -700,7 +700,6 @@ Ext.onReady( function() {
new Ext.Viewport({
autoScroll : true,
layout: 'fit',
items: [
{

10
workflow/engine/templates/dynaforms/fieldsHandler.php
View File

@@ -69,11 +69,17 @@
foreach($elements as $node_name=>$node){
if( $node_name == "___pm_boot_strap___"){
$boot_strap = $elements[$node_name];
$boot_strap = $elements[$node_name];
$hidden_fields = G::decrypt($boot_strap['__ATTRIBUTES__']['meta'], 'dynafieldsHandler');
//echo $hidden_fields;
$hidden_fields_list = explode(',', $hidden_fields);
unset($elements[$node_name]);
?>
<script>
parent.jsMeta = "<? echo $boot_strap['__ATTRIBUTES__']['meta'] ?>";
</script>
<?php
}
}
?>
@@ -112,7 +118,7 @@
<tr>
<td width="7%">
<?php if($node['__ATTRIBUTES__']['type'] != 'javascript' && $dynaformType != 'grid') {?>
<input id="chk@<?php echo $node_name?>" type="checkbox" onclick="fieldsHandlerSaveHidden()" <?php echo $checked?> />
<input id="chk@<?php echo $node_name?>" type="checkbox" onclick="parent.jsMeta = fieldsHandlerSaveHidden();" <?php echo $checked?> />
<?php } else {?>
&nbsp;
<?php }?>

113
workflow/engine/templates/users/users.js
View File

@@ -10,6 +10,7 @@ var infoMode;
var global = {};
var readMode;
var canEdit = true;
var flagPoliciesPassword = false;
//var rendeToPage='document.body';
global.IC_UID = '';
global.IS_UID = '';
@@ -387,7 +388,7 @@ Ext.onReady(function() {
xtype : 'textfield',
width : 260,
allowBlank : false
},
},
{
id : 'USR_USERNAME',
fieldLabel : _('ID_USER_ID'),
@@ -449,7 +450,63 @@ Ext.onReady(function() {
xtype : 'textfield',
inputType : 'password',
width : 260,
allowBlank : allowBlackStatus
allowBlank : allowBlackStatus,
listeners: {
blur : function(ob)
{
var spanAjax = '<span style="font: 9px tahoma,arial,helvetica,sans-serif;">';
var imageAjax = '<img width="13" height="13" border="0" src="/images/ajax-loader.gif">';
var labelAjax = _('ID_PASSWORD_TESTING');
Ext.getCmp('passwordReview').setText(spanAjax + imageAjax + labelAjax + '</span>', false);
Ext.getCmp('passwordReview').setVisible(true);
var passwordText = this.getValue();
Ext.Ajax.request({
url : 'usersAjax',
method:'POST',
params : {
'action' : 'testPassword',
'PASSWORD_TEXT' : passwordText
},
success: function(r,o){
var resp = Ext.util.JSON.decode(r.responseText);
if (resp.STATUS) {
flagPoliciesPassword = true;
} else {
flagPoliciesPassword = false;
}
Ext.getCmp('passwordReview').setText(resp.DESCRIPTION, false);
},
failure: function () {
Ext.MessageBox.show({
title: 'Error',
msg: 'Failed to store data',
buttons: Ext.MessageBox.OK,
animEl: 'mb9',
icon: Ext.MessageBox.ERROR
});
}
});
Ext.getCmp('passwordReview').setVisible(true);
if (Ext.getCmp('USR_CNF_PASS').getValue() != '') {
userExecuteEvent(document.getElementById('USR_CNF_PASS'), 'blur');
}
}
}
},
{
xtype: 'label',
fieldLabel: ' ',
id:'passwordReview',
width: 300,
labelSeparator: ''
},
{
id : 'USR_CNF_PASS',
@@ -457,7 +514,32 @@ Ext.onReady(function() {
xtype : 'textfield',
inputType : 'password',
width : 260,
allowBlank : allowBlackStatus
allowBlank : allowBlackStatus,
listeners: {
blur : function(ob)
{
var passwordText = Ext.getCmp('USR_NEW_PASS').getValue();
var passwordConfirm = this.getValue();
if (passwordText != passwordConfirm) {
var spanErrorConfirm = '<span style="color: red; font: 9px tahoma,arial,helvetica,sans-serif;">';
var imageErrorConfirm = '<img width="13" height="13" border="0" src="/images/delete.png">';
var labelErrorConfirm = _('ID_NEW_PASS_SAME_OLD_PASS');
Ext.getCmp('passwordConfirm').setText(spanErrorConfirm + imageErrorConfirm + labelErrorConfirm + '</span>', false);
Ext.getCmp('passwordConfirm').setVisible(true);
} else {
Ext.getCmp('passwordConfirm').setVisible(false);
}
}
}
},
{
xtype: 'label',
fieldLabel: ' ',
id:'passwordConfirm',
width: 300,
labelSeparator: ''
}
]
@@ -776,7 +858,15 @@ Ext.onReady(function() {
else {
frmDetails.render(document.body);
}
Ext.getCmp('passwordReview').setVisible(false);
Ext.getCmp('passwordConfirm').setVisible(false);
var spanAjax = '<span style="font: 9px tahoma,arial,helvetica,sans-serif;">';
var imageAjax = '<img width="13" height="13" border="0" src="/images/ajax-loader.gif">';
var labelAjax = _('ID_PASSWORD_TESTING');
Ext.getCmp('passwordReview').setText(spanAjax + imageAjax + labelAjax + '</span>', false);
});
function defineUserPanel()
@@ -815,6 +905,10 @@ function editUser()
}
function saveUser()
{
if (flagPoliciesPassword != true) {
Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('passwordReview').html);
return false;
}
var newPass = frmDetails.getForm().findField('USR_NEW_PASS').getValue();
var confPass = frmDetails.getForm().findField('USR_CNF_PASS').getValue();
@@ -1049,4 +1143,15 @@ function loadUserView()
}
function userExecuteEvent (element,event) {
if ( document.createEventObject ) {
// IE
var evt = document.createEventObject();
return element.fireEvent('on'+event,evt)
} else {
// firefox + others
var evt = document.createEvent("HTMLEvents");
evt.initEvent(event, true, true ); // event type,bubbling,cancelable
return !element.dispatchEvent(evt);
}
}

3
workflow/engine/xmlform/appFolder/appFolderDocsListOptions.xml
View File

@@ -24,7 +24,4 @@
<PAGED_TABLE_ID type="private"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

3
workflow/engine/xmlform/appFolder/appFolderDocsListSearchOptions.xml
View File

@@ -16,7 +16,4 @@
<PAGED_TABLE_ID type="private"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

1
workflow/engine/xmlform/cases/cases_Options.xml
View File

@@ -29,7 +29,6 @@
</MNU_SEARCH>-->
<JS type="javascript">
<![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
function casesDelete(app) {
ajax_function('cases_Delete','','APP_UID='+encodeURIComponent(app));
@#PAGED_TABLE_ID.refresh();

1
workflow/engine/xmlform/cases/cases_OptionsSent.xml
View File

@@ -54,7 +54,6 @@
</MNU_SEARCH>-->
<JS type="javascript">
<![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
param = getURLParam("filtertit");
selectionHighlight(param);

1
workflow/engine/xmlform/cases/cases_OptionsToDo.xml
View File

@@ -43,7 +43,6 @@
</MNU_SEARCH>-->
<JS type="javascript">
<![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
param = getURLParam("filter");
selectionHighlight(param);

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

@@ -21,7 +21,6 @@
<JS type="javascript"><![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
function $_GET(q,s) {
s = (s) ? s : self.location.search;
var re = new RegExp('&'+q+'=([^&]*)','i');

1
workflow/engine/xmlform/dynaforms/fields_Options.xml
View File

@@ -10,7 +10,6 @@
<fields_Order type="private" defaultValue="../dynaforms/fields_Order"/>
<js type="javascript" replaceTags="1">
<![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
var validatingForm;
function fieldsAdd( type ){
popupWindow('@G::LoadTranslation(ID_ADD) ' + type , '@G::encryptlink(@#fields_Edit)?A=@%URL&TYPE='+encodeURIComponent(type) , 510, 650, null,false,true);

4
workflow/engine/xmlform/groups/groups_userSearch.xml
View File

@@ -5,7 +5,5 @@
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

4
workflow/engine/xmlform/gulliver/pagedTable_Options.xml
View File

@@ -6,7 +6,5 @@
<en>Advanced Search</en>
</MNU_SEARCH>-->
<SEARCH_FILTER_FORM type="private"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

1
workflow/engine/xmlform/messages/messages_Options.xml
View File

@@ -10,7 +10,6 @@
<messages_Delete type="private" defaultValue="../messages/messages_Delete"/>
<PAGED_TABLE_ID type="private"/>
<js type="javascript" replaceTags="1"><![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
var currentPagedTable = @#PAGED_TABLE_ID;
function messagesAdd(){
popupWindow('@G::LoadTranslation(ID_ADD_MESSAGE)', '@G::encryptlink(@#messages_Edit)?PRO_UID=@%PRO_UID' , 500, 300 );

19
workflow/engine/xmlform/processes/processes_FilesOptions.xml
View File

@@ -25,11 +25,22 @@ var oUploadFilesPanel;
var oUploadFilesPanel;
var uploadFilesScreen = function(PRO_UID, MAIN_DIRECTORY, CURRENT_DIRECTORY) {
var swNavigator;
var swNavigator;
if(navigator.appName=='Microsoft Internet Explorer'){
swNavigator='ie'
wd=350;
hg=200;
var rv = '';
if (new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})").exec(navigator.userAgent) != null) {
rv = parseFloat(RegExp.$1);
}
if (rv >= 9) {
swNavigator='ie9+';
}
else {
swNavigator='ie';
}
wd = 420;
hg = 170;
} else {
swNavigator='wknormal';
wd=420;

1
workflow/engine/xmlform/processes/processes_Options.xml
View File

@@ -18,7 +18,6 @@
<SEARCH_FILTER_FORM type="private"/>
<JS type="javascript" replacetags="1"><![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
var panel;
var panDel=function(link,uid)
{

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

@@ -4,7 +4,5 @@
>
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

3
workflow/engine/xmlform/roles/roles_Options.xml
View File

@@ -14,9 +14,6 @@
<CONFIRM type="private"/>
<JS type="javascript"><![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
PROCESS_REQUEST_FILE = '../roles/roles_Ajax';
PROCESS_REQUEST_FILE_USER = '../roles/roles_AddUser';

4
workflow/engine/xmlform/roles/roles_userSearch.xml
View File

@@ -5,7 +5,5 @@
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

2
workflow/engine/xmlform/steps/conditions_Options.xml
View File

@@ -7,8 +7,6 @@
<PAGED_TABLE_ID type="private"/>
<JS type="javascript" replaceTags="1">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
function editCondition(uid, sStepTitle)
{
popupWindow('@G::LoadTranslation(ID_EDIT_CONDITIONS_OF_STEP)' + ': ' + sStepTitle, '@G::encryptLink(@#URL_CONDITIONS_EDIT)?UID='+ uid , 500, 216);

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

@@ -34,7 +34,6 @@
<JS type="javascript" replaceTags="1">
<![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
/*
document.onkeypress=function(e){
var esIE=(document.all);

1
workflow/engine/xmlform/users/users_Options.xml
View File

@@ -14,7 +14,6 @@
<CONFIRM type="private"/>
<JS type="javascript"><![CDATA[
getField('PAGED_TABLE_FAST_SEARCH').value = '';
var simpleUserDelete = function(sUser) {
new leimnud.module.app.confirm().make({
label:'@#CONFIRM',

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

@@ -5,7 +5,5 @@
<PAGED_TABLE_ID type="private"/>
<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
<JS type="javascript">
getField('PAGED_TABLE_FAST_SEARCH').value = '';
</JS>
</dynaForm>

BIN
workflow/public_html/images/processmaker2.logo2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB