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

Merge pull request #1750 from ralpheav/master

Browse Source 
Extended commit {BUG 11963: & adding advice Trigger Editor msg }
This commit is contained in:
julceslauhub
2013-05-23 11:19:57 -07:00
parent 22917e10a2 c28580e1a7
commit 1723ba968e
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,9 +143,9 @@ Ext.onReady(function(){
//columns for table columns grid //columns for table columns grid
var cmColumns = [ var cmColumns = [
{ {
id: 'uid', id: 'uid',
dataIndex: 'uid', dataIndex: 'uid',
hidden: true hidden: true
}, },
{ {
id: 'field_uid', id: 'field_uid',
@@ -330,7 +330,8 @@ Ext.onReady(function(){
var cm = new Ext.grid.ColumnModel({ var cm = new Ext.grid.ColumnModel({
// specify any defaults for each column // specify any defaults for each column
defaults: { defaults: {
sortable: true // columns are not sortable by default resizable: false,
sortable: true // columns are not sortable by default
}, },
columns:cmColumns columns:cmColumns
}); });

29
workflow/engine/templates/pmTables/editReport.js
View File

@@ -254,38 +254,38 @@ Ext.onReady(function(){
//columns for table columns grid //columns for table columns grid
var cmColumns = [ var cmColumns = [
{ {
id: 'uid', id: 'uid',
dataIndex: 'uid', dataIndex: 'uid',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
{ {
dataIndex: '_index', dataIndex: '_index',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
{ {
dataIndex: '_isset', dataIndex: '_isset',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
{ {
id: 'field_uid', id: 'field_uid',
dataIndex: 'field_uid', dataIndex: 'field_uid',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
{ {
id: 'field_key', id: 'field_key',
dataIndex: 'field_key', dataIndex: 'field_key',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
{ {
id: 'field_null', id: 'field_null',
dataIndex: 'field_null', dataIndex: 'field_null',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
{ {
id: 'field_dyn', id: 'field_dyn',
@@ -426,7 +426,8 @@ Ext.onReady(function(){
var cm = new Ext.grid.ColumnModel({ var cm = new Ext.grid.ColumnModel({
// specify any defaults for each column // specify any defaults for each column
defaults: { defaults: {
sortable: true // columns are not sortable by default resizable: false,
sortable: true // columns are not sortable by default
}, },
columns:cmColumns columns:cmColumns
}); });

2
workflow/engine/xmlform/triggers/triggerCopy.html
View File

@@ -43,7 +43,7 @@
</tr> </tr>
<tr> <tr>
<td class='FormLabel' width="{$form_labelWidth}">{$TRI_WEBBOT}</td> <td class='FormLabel' width="{$form_labelWidth}">{$TRI_WEBBOT}</td>
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_WEBBOT}</td> <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_WEBBOT}<label class="FormRequiredTextMessage"><font color="red">*</font>{php} echo " ".(G::LoadTranslation('ID_TRIGGER_EDITOR_HINT_ADVISE_MESSAGE')); {/php}</label></td>
</tr> </tr>
<tr> <tr>
<td class='FormButton' colspan="2" align="center">{$form.BTNCOPYSAVE}&nbsp;{$form.BTNCANCEL}</td> <td class='FormButton' colspan="2" align="center">{$form.BTNCOPYSAVE}&nbsp;{$form.BTNCANCEL}</td>

2
workflow/engine/xmlform/triggers/triggersCustom.html
View File

@@ -35,7 +35,7 @@
<tr> <tr>
<td class='FormLabel' width="{$form_labelWidth}">{$TRI_WEBBOT}</td> <td class='FormLabel' width="{$form_labelWidth}">{$TRI_WEBBOT}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.TRI_WEBBOT} </td> //--> <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.TRI_WEBBOT} </td> //-->
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_WEBBOT}</td> <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_WEBBOT}<label class="FormRequiredTextMessage"><font color="red">*</font>{php} echo " ".(G::LoadTranslation('ID_TRIGGER_EDITOR_HINT_ADVISE_MESSAGE'));{/php}</label></td>
</tr> </tr>
<tr> <tr>
<td class='FormButton' colspan="2" align="center">{$form.SAVE}&nbsp;{$form.BTN_CANCEL}</td> <td class='FormButton' colspan="2" align="center">{$form.SAVE}&nbsp;{$form.BTN_CANCEL}</td>

2
workflow/engine/xmlform/triggers/triggers_Edit.html
View File

@@ -23,7 +23,7 @@
<tr> <tr>
<td class="FormLabel" width="{$form_labelWidth}">{$TRI_WEBBOT}</td> <td class="FormLabel" width="{$form_labelWidth}">{$TRI_WEBBOT}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.TRI_WEBBOT} </td> //--> <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.TRI_WEBBOT} </td> //-->
<td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.TRI_WEBBOT}</td> <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.TRI_WEBBOT}<label class="FormRequiredTextMessage"><font color="red">*</font>{php} echo " ".(G::LoadTranslation('ID_TRIGGER_EDITOR_HINT_ADVISE_MESSAGE'));{/php}</label></td>
</tr> </tr>
<tr> <tr>
<td class="FormButton" colspan="2" align="center"> <br/> {$form.SAVE} &nbsp; {$form.BTN_CANCEL} </td> <td class="FormButton" colspan="2" align="center"> <br/> {$form.SAVE} &nbsp; {$form.BTN_CANCEL} </td>