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

BUG 3889 Change the default option for "Next Step Link" under DynaForm "Properties" SOLVED

Browse Source 
- Changed the default "nextstepsave" value for new dynaforms, now the default value is "prompt"
This commit is contained in:
Julio Cesar Laura
2012-08-16 12:27:59 -04:00
parent 3947d5418e
commit 1a8994ef72
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/classes/model/Dynaform.php
View File

@@ -2,7 +2,7 @@
/** /**
* Dynaform.php * Dynaform.php
* @package workflow.engine.classes.model * @package workflow.engine.classes.model
* *
* ProcessMaker Open Source Edition * ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc. * Copyright (C) 2004 - 2011 Colosa Inc.
* *
@@ -81,7 +81,7 @@ class Dynaform extends BaseDynaform {
if ($this->dyn_title !== $v || $v === '') { if ($this->dyn_title !== $v || $v === '') {
$this->dyn_title = $v; $this->dyn_title = $v;
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en'; $lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
$res = Content::addContent( 'DYN_TITLE', '', $this->getDynUid(), $lang, $this->dyn_title ); $res = Content::addContent( 'DYN_TITLE', '', $this->getDynUid(), $lang, $this->dyn_title );
} }
@@ -127,7 +127,7 @@ class Dynaform extends BaseDynaform {
if ($this->dyn_description !== $v || $v === '') { if ($this->dyn_description !== $v || $v === '') {
$this->dyn_description = $v; $this->dyn_description = $v;
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en'; $lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
$res = Content::addContent( 'DYN_DESCRIPTION', '', $this->getDynUid(), $lang, $this->dyn_description ); $res = Content::addContent( 'DYN_DESCRIPTION', '', $this->getDynUid(), $lang, $this->dyn_description );
} }
@@ -175,7 +175,7 @@ class Dynaform extends BaseDynaform {
$con->commit(); $con->commit();
$sXml = '<?xml version="1.0" encoding="UTF-8"?>'."\n"; $sXml = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
$sXml .= '<dynaForm type="' . $this->getDynType() . '" name="' . $this->getProUid() . '/' . $this->getDynUid() . '" width="500" enabletemplate="0" mode="">'."\n"; $sXml .= '<dynaForm type="' . $this->getDynType() . '" name="' . $this->getProUid() . '/' . $this->getDynUid() . '" width="500" enabletemplate="0" mode="" nextstepsave="prompt">'."\n";
$sXml .= '</dynaForm>'; $sXml .= '</dynaForm>';
G::verifyPath(PATH_DYNAFORM . $this->getProUid(), true); G::verifyPath(PATH_DYNAFORM . $this->getProUid(), true);
$oFile = fopen(PATH_DYNAFORM . $this->getProUid() . '/' . $this->getDynUid() . '.xml', 'w'); $oFile = fopen(PATH_DYNAFORM . $this->getProUid() . '/' . $this->getDynUid() . '.xml', 'w');
@@ -200,7 +200,7 @@ class Dynaform extends BaseDynaform {
/** /**
* *
* Creates a Dynaform based on a PMTable * Creates a Dynaform based on a PMTable
* *
* @name createFromPMTable * @name createFromPMTable
* @author gustavo cruz gustavo[at]colosa[dot]com * @author gustavo cruz gustavo[at]colosa[dot]com
* @param array $aData Fields with : * @param array $aData Fields with :
@@ -252,7 +252,7 @@ class Dynaform extends BaseDynaform {
} else { } else {
$sql = 'DESC '.$addTabName; $sql = 'DESC '.$addTabName;
} }
$dbh = Propel::getConnection(AdditionalTablesPeer::DATABASE_NAME); $dbh = Propel::getConnection(AdditionalTablesPeer::DATABASE_NAME);
$sth = $dbh->createStatement(); $sth = $dbh->createStatement();
$res = $sth->executeQuery($sql, ResultSet::FETCHMODE_ASSOC); $res = $sth->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
@@ -277,7 +277,7 @@ class Dynaform extends BaseDynaform {
if ($res->get('Key') != '') { if ($res->get('Key') != '') {
$countKeys++; $countKeys++;
} }
if ($res->get('Extra') == 'auto_increment') { if ($res->get('Extra') == 'auto_increment') {
$keyRequered .= $res->get('Field'); $keyRequered .= $res->get('Field');
} }
} }
@@ -474,7 +474,7 @@ class Dynaform extends BaseDynaform {
throw($oError); throw($oError);
} }
} }
function getDynaformContent( $dynaformUid) { function getDynaformContent( $dynaformUid) {
$content = ''; $content = '';
$fields = $this->Load ( $dynaformUid); $fields = $this->Load ( $dynaformUid);
@@ -482,9 +482,9 @@ class Dynaform extends BaseDynaform {
if (file_exists( $filename )) { if (file_exists( $filename )) {
$content = file_get_contents ( $filename ); $content = file_get_contents ( $filename );
} }
return $content; return $content;
} }
function getDynaformFields( $dynaformUid) { function getDynaformFields( $dynaformUid) {
$content = ''; $content = '';
@@ -493,10 +493,10 @@ class Dynaform extends BaseDynaform {
if (file_exists( $filename )) { if (file_exists( $filename )) {
$content = file_get_contents ( $filename ); $content = file_get_contents ( $filename );
} }
$G_FORM = new xmlform ( $fields['DYN_FILENAME'] , PATH_DYNAFORM ); $G_FORM = new xmlform ( $fields['DYN_FILENAME'] , PATH_DYNAFORM );
$G_FORM->parseFile( $filename , SYS_LANG, true ); $G_FORM->parseFile( $filename , SYS_LANG, true );
return $G_FORM->fields; return $G_FORM->fields;
} }