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

Merged in gproly/processmaker (pull request #1356)

Browse Source 
IMPROVEMENT PM-1355
This commit is contained in:
Julio Cesar Laura Avendaño
2015-01-26 08:43:25 -04:00
parent 252274572f 4710cadb44
commit d58e376f89
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -851,7 +851,15 @@ class Ajax
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = ""; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP_LABEL"] = "";
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP"] = "#"; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_STEP"] = "#";
$Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_ACTION"] = "return false;"; $Fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["NEXT_ACTION"] = "return false;";
$G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_POST["DYN_UID"], "", $Fields["APP_DATA"], "", "", "view"); G::LoadClass('pmDynaform');
$a = new pmDynaform($_REQUEST['DYN_UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->app_data["PROCESS"] = $_SESSION['PROCESS'];
$a->app_data["SYS_SYS"] = SYS_SYS;
$a->printView((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION']);
} else {
$G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_POST["DYN_UID"], "", $Fields["APP_DATA"], "", "", "view");
}
?> ?>
<script type="text/javascript"> <script type="text/javascript">

1
workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html
View File

@@ -29,6 +29,7 @@
var credentials = {credentials}; var credentials = {credentials};
$(window).load(function () { $(window).load(function () {
var data = jsondata; var data = jsondata;
data.items[0].mode = "view";
window.project = new PMDynaform.core.Project({ window.project = new PMDynaform.core.Project({
data: data, data: data,
keys: { keys: {

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

@@ -447,6 +447,7 @@ Ext.onReady(function(){
id: "mnuGenerateBpmn", id: "mnuGenerateBpmn",
text: _("ID_GENERATE_BPMN_PROJECT"), text: _("ID_GENERATE_BPMN_PROJECT"),
iconCls: "button_menu_ext ss_sprite ss_page_white_go", iconCls: "button_menu_ext ss_sprite ss_page_white_go",
hidden: true,
handler: function () handler: function ()
{ {
generateBpmn(); generateBpmn();