fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git@github.com:colosa/processmaker.git

Browse Source
This commit is contained in:
marcelo
2013-03-26 09:07:13 -04:00
parent af5efc58aa a8578c38cc
commit 436d19a07c
14 changed files with 85 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -691,12 +691,6 @@ msgstr "You are in the first step!"
msgid "Edit process"
msgstr "Edit process"
# TRANSLATION
# JAVASCRIPT/curriculum
#: JAVASCRIPT/curriculum
msgid "Resume"
msgstr "Resume"
# TRANSLATION
# JAVASCRIPT/ID_OPEN_SEARCH
#: JAVASCRIPT/ID_OPEN_SEARCH
@@ -32426,8 +32420,8 @@ msgstr "Photo"
# users/users_EditLDAP.xml?USR_RESUME
# users/users_EditLDAP.xml
#: file - USR_RESUME
msgid "[users/users_EditLDAP.xml?USR_RESUME] Résumé"
msgstr "Résumé"
msgid "[users/users_EditLDAP.xml?USR_RESUME] Resume"
msgstr "Resume"
# users/users_EditLDAP.xml?MAX_FILES_SIZE
# users/users_EditLDAP.xml

11
workflow/engine/controllers/admin.php
View File

@@ -44,6 +44,11 @@ class Admin extends Controller
// $c = new Configurations();
// $configPage = $c->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
// $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
if (isset($sysConf["session.gc_maxlifetime"])) {
$sysConf["session_gc_maxlifetime"] = $sysConf["session.gc_maxlifetime"];
} else {
$sysConf["session_gc_maxlifetime"] = ini_get('session.gc_maxlifetime');
}
$this->setJSVar( 'skinsList', $skins );
$this->setJSVar( 'languagesList', $languagesList );
@@ -90,7 +95,8 @@ class Admin extends Controller
$fields = $calendarObj->getCalendarInfoE( $CalendarUid );
$fields['OLD_NAME'] = $fields['CALENDAR_NAME'];
}
if (! isset( $fields['CALENDAR_UID'] )) { //For a new Calendar
// For a new Calendar
if (! isset( $fields['CALENDAR_UID'] )) {
$fields['CALENDAR_UID'] = $CalendarUid;
$fields['OLD_NAME'] = '';
@@ -99,7 +105,8 @@ class Admin extends Controller
$fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_START'] = "09:00";
$fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_END'] = "17:00";
}
if ((isset( $_GET['cp'] )) && ($_GET['cp'] == 1)) { // Copy Calendar
// Copy Calendar
if ((isset( $_GET['cp'] )) && ($_GET['cp'] == 1)) {
$fields['CALENDAR_UID'] = G::GenerateUniqueID();
$fields['CALENDAR_NAME'] = G::LoadTranslation( "ID_COPY_OF" ) . " " . $fields['CALENDAR_NAME'];
$fields['OLD_NAME'] = $fields['CALENDAR_NAME'];

7
workflow/engine/controllers/adminProxy.php
View File

@@ -86,6 +86,13 @@ class adminProxy extends HttpProxyController
$updatedConf['proxy_pass'] = G::encrypt($httpData->proxy_pass, 'proxy_pass');
}
$sessionGcMaxlifetime = ini_get('session.gc_maxlifetime');
if (($httpData->max_life_time != "") && ($sessionGcMaxlifetime != $httpData->max_life_time)) {
if (!isset($sysConf['session.gc_maxlifetime']) || ($sysConf['session.gc_maxlifetime'] != $httpData->max_life_time)) {
$updatedConf['session.gc_maxlifetime'] = $httpData->max_life_time;
}
}
if ($updateRedirector) {
if (!file_exists(PATH_HTML . 'index.html')) {
throw new Exception('The index.html file is not writable on workflow/public_html directory.');

2
workflow/engine/data/mssql/insert.sql
View File

@@ -1599,8 +1599,6 @@ SELECT 'LABEL','ID_YOU_ARE_FIRST_STEP','en','You are in the first step!','2012-0
UNION ALL
SELECT 'JAVASCRIPT','EDIT_PROCESS','en','Edit process','2012-06-01'
UNION ALL
SELECT 'JAVASCRIPT','curriculum','en','Resume','2012-06-01'
UNION ALL
SELECT 'JAVASCRIPT','ID_OPEN_SEARCH','en','Advanced Search','2012-06-01'
UNION ALL
SELECT 'JAVASCRIPT','ID_CLOSE_SEARCH','en','Close Search','2012-06-01'

1
workflow/engine/data/mysql/insert.sql
View File

@@ -1486,7 +1486,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CANCEL_CASE','en','Cancel Case','2012-06-01') ,
( 'LABEL','ID_YOU_ARE_FIRST_STEP','en','You are in the first step!','2012-06-01') ,
( 'JAVASCRIPT','EDIT_PROCESS','en','Edit process','2012-06-01') ,
( 'JAVASCRIPT','curriculum','en','Resume','2012-06-01') ,
( 'JAVASCRIPT','ID_OPEN_SEARCH','en','Advanced Search','2012-06-01') ,
( 'JAVASCRIPT','ID_CLOSE_SEARCH','en','Close Search','2012-06-01') ,
( 'JAVASCRIPT','ID_URL_OF_LINK','en','Enter the URL for the link','2012-06-01') ,

31
workflow/engine/methods/outputdocs/outputdocs_Edit.php
View File

@@ -61,13 +61,30 @@ try {
switch ($type) {
case 'HTML':
//$G_PUBLISH->AddContent('xmlform', 'xmlform', 'outputdocs/outputdocs_Edit', '', $aFields , '../outputdocs/outputdocs_Save');
$oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->assign( 'OUT_DOC_UID', $_GET['OUT_DOC_UID'] );
$translations = G::getTranslations( Array ('ID_FILE','ID_OUT_PUT_DOC_UPLOAD_TITLE','ID_UPLOADING_FILE','ID_UPLOAD','ID_CANCEL','ID_SAVE','ID_LOAD_FROM_FILE','ID_SELECT_TEMPLATE_FILE','ID_ALERT_MESSAGE','ID_INVALID_FILE') );
// $oHeadPublisher->assign('TRANSLATIONS', $translations);
$oHeadPublisher->addExtJsScript( 'outputdocs/htmlEditor', false ); //adding a javascript file .js
G::RenderPage( 'publish', 'extJs' );
global $G_PUBLISH;
$G_PUBLISH = new Publisher();
$fcontent = '';
$proUid = '';
$filename = '';
$title = '';
require_once 'classes/model/OutputDocument.php';
$oOutputDocument = new OutputDocument();
if (isset( $_REQUEST['OUT_DOC_UID'] )) {
$aFields = $oOutputDocument->load( $_REQUEST['OUT_DOC_UID'] );
$fcontent = $aFields['OUT_DOC_TEMPLATE'];
$proUid = $aFields['PRO_UID'];
$filename = $aFields['OUT_DOC_FILENAME'];
$title = $aFields['OUT_DOC_TITLE'];
}
$aData = Array (
'PRO_UID' => $proUid,
'OUT_DOC_TEMPLATE' => $fcontent,
'FILENAME' => $filename,
'OUT_DOC_UID'=> $_REQUEST['OUT_DOC_UID'],
'OUT_DOC_TITLE'=> $title,
);
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'outputdocs/outputdocs_Edit', '', $aData );
G::RenderPage( 'publish', 'blank' );
die();
break;
case 'JRXML':

21
workflow/engine/methods/users/users_Ajax.php
View File

@@ -345,6 +345,7 @@ try {
require_once 'classes/model/LoginLog.php';
require_once 'classes/model/Department.php';
require_once 'classes/model/AppCacheView.php';
require_once PATH_RBAC . 'model/Roles.php';
global $RBAC;
G::LoadClass('configuration');
$co = new Configurations();
@@ -366,8 +367,7 @@ try {
$cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_EMAIL, '%' . $filter . '%', Criteria::LIKE))));
$oCriteria->add($cc);
}
$oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'
), Criteria::NOT_IN);
$oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
if ($auths != '') {
$totalRows = sizeof($aUsers);
} else {
@@ -393,23 +393,11 @@ try {
$oCriteria->addAsColumn('TOTAL_CASES', 0);
$oCriteria->addAsColumn('DUE_DATE_OK', 1);
$sep = "'";
$oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'
), Criteria::NOT_IN);
$oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
if ($filter != '') {
$cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_EMAIL, '%' . $filter . '%', Criteria::LIKE))));
$oCriteria->add($cc);
}
// $sw_add = false;
// for ($i=0; $i < sizeof($aUsers); $i++){
// if ($i>0){
// $tmpL = $tmpL->addOr($oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL));
// }else{
// $uList = $oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL);
// $tmpL = $uList;
// $sw_add = true;
// }
// }
// if ($sw_add) $oCriteria->add($uList);
if (sizeof($aUsers) > 0) {
$oCriteria->add(UsersPeer::USR_UID, $aUsers, Criteria::IN);
} elseif ($totalRows == 0 && $auths != '') {
@@ -438,9 +426,12 @@ try {
require_once PATH_CONTROLLERS . 'adminProxy.php';
$uxList = adminProxy::getUxTypesList();
$oRoles = new Roles();
$rows = Array();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$uRole = $oRoles->loadByCode($row['USR_ROLE']);
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
$row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
$row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';
$row['TOTAL_CASES'] = isset($aCases[$row['USR_UID']]) ? $aCases[$row['USR_UID']] : 0;

14
workflow/engine/templates/admin/system.js
View File

@@ -101,12 +101,26 @@ Ext.onReady(function(){
name : 'memory_limit',
fieldLabel: _('ID_MEMORY_LIMIT'),
allowBlank: false,
autoCreate: {tag: "input", type: "text", autocomplete: "off", maxlength: 15 },
value: sysConf.memory_limit,
listeners:{
change: function(){
changeSettings();
}
}
}, {
xtype: 'numberfield',
id : 'max_life_time',
name : 'max_life_time',
fieldLabel: _('ID_MAX_LIFETIME'),
// allowBlank: false,
autoCreate: {tag: "input", type: "text", autocomplete: "off", maxlength: 15 },
value: sysConf.session_gc_maxlifetime,
listeners:{
change: function(){
changeSettings();
}
}
}
]
});

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

@@ -112,7 +112,7 @@ Ext.onReady(function(){
columnAlign = 'right';
columnEditor = {
xtype : 'numberfield',
format : 'Y-m-d',
decimalPrecision : 8,
allowBlank : true
};
break;

14
workflow/engine/xmlform/outputdocs/outputdocs_Edit.xml
View File

@@ -20,7 +20,19 @@
function cancel(){
tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
outputdocsEditor.remove();
if (( _BROWSER.name == 'msie' ) && ( _BROWSER.version < '9' )) {
window.close();
} else {
outputdocsEditor.remove();
}
}
if (( _BROWSER.name == 'msie' ) && ( _BROWSER.version < '9' )) {
function outputdocsSave( form ) {
tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
form.action = '../outputdocs/outputdocs_Save';
ajax_post( form.action, form, 'POST' );
window.close();
}
}
]]></JS>

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

@@ -25,7 +25,7 @@ var outputdocsEditor;
var left = (screen.width/2)-(w/2);
var top = (screen.height/2);//-(h/2);
var targetWin = window.open (pageURL, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);
var targetWin = window.open (pageURL, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);
}
////////////////////////////////////////////////////

1
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -299,6 +299,7 @@ var insertFormVar = function(sFieldName, sValue) {
else {
if (document.selection) {
oAux.focus();
oAux.value = '';
document.selection.createRange().text = sValue;
}
}

2
workflow/engine/xmlform/users/users_EditLDAP.xml
View File

@@ -14,7 +14,7 @@
<en>Photo</en>
</USR_PHOTO>
<USR_RESUME type="file" group="1">
<en>Résumé</en>
<en>Resume</en>
</USR_RESUME>
<MAX_FILES_SIZE type="edit" mode="view">
<en>Max upload files size in bytes</en>

8
workflow/public_html/sysGeneric.php
View File

@@ -223,8 +223,13 @@ define( 'PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl' );
define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' );
define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' );
$config = Bootstrap::getSystemConfiguration();
// starting session
$timelife = ini_get('session.gc_maxlifetime');
if (isset($config['session.gc_maxlifetime'])) {
$timelife = $config['session.gc_maxlifetime'];
} else {
$timelife = ini_get('session.gc_maxlifetime');
}
if (is_null($timelife)) {
$timelife = 1440;
}
@@ -232,7 +237,6 @@ ini_set('session.gc_maxlifetime', $timelife);
ini_set('session.cookie_lifetime', $timelife);
session_start();
$config = Bootstrap::getSystemConfiguration();
$e_all = defined( 'E_DEPRECATED' ) ? E_ALL & ~ E_DEPRECATED : E_ALL;
$e_all = defined( 'E_STRICT' ) ? $e_all & ~ E_STRICT : $e_all;