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

BUG 6350: SOLVED, we just to validate the process title as required

Browse Source
This commit is contained in:
erik
2011-03-21 16:05:02 -04:00
parent bfc93d1a75
commit 044f2420c8
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/model/Process.php
View File

@@ -565,9 +565,10 @@ class Process extends BaseProcess {
while( $dt->next() ) {
$row = $dt->getRow();
// verify if the title is already set on the current language
if ( $row['CON_CATEGORY'] == 'PRO_TITLE' && trim($row['CON_VALUE']) == '') {
if ( ($row['CON_CATEGORY'] == 'PRO_TITLE' || $row['CON_CATEGORY'] == 'PRO_DESCRIPTION') && trim($row['CON_VALUE']) == '') {
// if not, then load the record to generate content for current language
$row = $this->load($row['CON_ID']);
$proData = $this->load($row['CON_ID']);
$row['CON_VALUE'] = $row['CON_CATEGORY'] == 'PRO_TITLE' ? $proData['PRO_TITLE'] : $proData['PRO_DESCRIPTION'];
}
$processesDetails[ $row['CON_ID']] [$row['CON_CATEGORY']] = $row['CON_VALUE'];
}

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

@@ -398,7 +398,7 @@ function newProcess(){
editable : false,
width: 180,
allowBlank : true,
value: '',
store : new Ext.data.Store( {
autoLoad: true, //autoload the data
proxy : new Ext.data.HttpProxy( {
@@ -415,6 +415,10 @@ function newProcess(){
})
})
});
ProcessCategories.store.on('load',function(store) {
ProcessCategories.setValue(store.getAt(0).get('CATEGORY_UID'));
});
var frm = new Ext.FormPanel( {
id: 'newProcessForm',
@@ -425,7 +429,8 @@ function newProcess(){
id: 'PRO_TITLE',
fieldLabel: _('ID_TITLE'),
xtype:'textfield',
width: 260
width: 260,
allowBlank: false
}, {
id: 'PRO_DESCRIPTION',
fieldLabel: _('ID_DESCRIPTION'),