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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-11603

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2013-06-24 16:29:56 +00:00
parent 6ee0d083be 1d5dd6e1f1
commit 6c42135f30
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,6 +458,11 @@ var dynaformEditor={
if( ! xmlEditor ) {
clientWinSize = getClientWindowSize();
if (_BROWSER.name == 'msie') {
var content_withoutLabel = document.getElementById("form[XML]").parentNode;
content_withoutLabel.style.height = (clientWinSize.height - 140) + 'px';
}
/*xmlEditor = CodeMirror.fromTextArea('form[XML]', {
height: (clientWinSize.height - 120) + "px",
width: (_BROWSER.name == 'msie' ? '100%' : '98%'),
@@ -532,6 +537,11 @@ var dynaformEditor={
if( ! jsEditor )
{
clientWinSize = getClientWindowSize();
if (_BROWSER.name == 'msie') {
var content_withoutLabel = document.getElementById("form[JS]").parentNode;
content_withoutLabel.style.height = (clientWinSize.height - 140) + 'px';
}
startJSCodePress();
/*jsEditor = CodeMirror.fromTextArea('form[JS]', {
@@ -544,9 +554,9 @@ var dynaformEditor={
continuousScanning: 500 });*/
jsEditor = CodeMirror.fromTextArea(document.getElementById("form[JS]"), {
mode: "javascript",
lineNumbers: true,
lineWrapping: true });
mode: "javascript",
lineNumbers: true,
lineWrapping: true });
}
} else {
showRowById('JS_TITLE');

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

@@ -241,7 +241,13 @@ Ext.onReady(function(){
}
//String
if (selCombo == "CHAR" || selCombo == "VARCHAR" || selCombo == "LONGVARCHAR") {
if (selCombo == "CHAR" || selCombo == "VARCHAR") {
swAI = 0;
}
if (selCombo == "LONGVARCHAR") {
swPK = 0;
swAI = 0;
}

2
workflow/engine/templates/xmlform.html
View File

@@ -48,7 +48,7 @@
{elseif ($field->type==='')}
{elseif ($field->withoutLabel)}
<tr>
<td colspan="2" class="withoutLabel">{$field->field}</td>
<td colspan="2" class="withoutLabel" style="height:auto;">{$field->field}</td>
</tr>
{elseif (isset($field->withoutValue) && $field->withoutValue)}
<tr>