diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php
index 23bf12e74..177532364 100755
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -858,7 +858,6 @@ class OutputDocument extends BaseOutputDocument
}
$doc = new DOMDocument('1.0', 'UTF-8');
$doc->loadHtml($sContent);
- $doc->encoding = 'UTF-8';
$pdf->writeHTML($doc->saveXML(), false, false, false, false, '');
// ---------------------------------------------------------
// Close and output PDF document
diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php
index 170bcf9c2..f500ddcfb 100755
--- a/workflow/engine/controllers/pmTables.php
+++ b/workflow/engine/controllers/pmTables.php
@@ -109,6 +109,7 @@ class pmTables extends Controller
$this->setJSVar( 'columnsTypes', $columnsTypesList );
$this->setJSVar( 'dataNumRows', $dataNumRows );
$this->setJSVar( '_plugin_permissions', $repTabPluginPermissions );
+ $this->setJSVar( 'sizeTableName', $this->getSizeTableName());
G::RenderPage( 'publish', 'extJs' );
}
@@ -180,5 +181,29 @@ class pmTables extends Controller
}
return $repTabPluginPermissions;
}
+ /**
+ *
+ * Return of size ok the engine on course.
+ *
+ * @return int
+ */
+ public function getSizeTableName()
+ {
+ switch (DB_ADAPTER) {
+ case 'mysql':
+ $tableSize = 64;
+ break;
+ case 'mssql':
+ $tableSize = 128;
+ break;
+ case 'oci8':
+ $tableSize = 30;
+ default:
+ $tableSize = 30;
+ break;
+ }
+ $tableSize = $tableSize - 4; // Prefix PMT_
+ return $tableSize;
+ }
}
diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js
index 1e4bb7074..67ae8223e 100755
--- a/workflow/engine/templates/pmTables/edit.js
+++ b/workflow/engine/templates/pmTables/edit.js
@@ -547,10 +547,11 @@ Ext.onReady(function(){
xtype:'textfield',
emptyText: _("ID_SET_A_TABLE_NAME"),
width: 250,
+ autoCreate: {tag: "input", type: "text", autocomplete: "off", maxlength: sizeTableName },
stripCharsRe: /(\W+)/g,
listeners:{
change: function(){
- this.setValue(this.getValue().toUpperCase())
+ this.setValue(this.getValue().toUpperCase());
}
}
});
diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js
index 9c67d77b7..8fa64c6db 100755
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -802,6 +802,7 @@ Ext.onReady(function(){
xtype:'textfield',
emptyText: _("ID_SET_A_TABLE_NAME"),
width: 250,
+ autoCreate: {tag: "input", type: "text", autocomplete: "off", maxlength: sizeTableName },
stripCharsRe: /(\W+)/g,
listeners:{
change: function(){
diff --git a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
index a813e6a11..a5e48da27 100755
--- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
@@ -11,87 +11,87 @@
-
+
Text field
-
+
Currency
-
+
Percentage
-
+
Password
-
+
Suggest
-
-
+ <title type="toolButton" class="ss_sprite button_toolbar ss_title" onclick="fieldsAdd('title');return false;" buttonType="class">
<en>Title</en>
-
+
Subtitle
-