From 4d7bf9dd92b72c907cae2ef165b1a4208d4343bc Mon Sep 17 00:00:00 2001 From: girish Date: Thu, 9 Dec 2010 13:37:02 +0000 Subject: [PATCH] Fixed not Null in schema.sql and aligning in processmap --- workflow/engine/data/mysql/schema.sql | 10 +++++----- workflow/engine/templates/bpmn/processmap.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index aa743637e..4bbf7ab01 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -467,7 +467,7 @@ CREATE TABLE `ROUTE` `ROU_TARGETANCHOR` INTEGER default 0, `ROU_TO_PORT` INTEGER default 1 NOT NULL, `ROU_FROM_PORT` INTEGER default 2 NOT NULL, - `ROU_EVN_UID` VARCHAR(32) default '' NOT NULL, + `ROU_EVN_UID` VARCHAR(32) default '' NULL, PRIMARY KEY (`ROU_UID`) )Type=MyISAM DEFAULT CHARSET='utf8' COMMENT='Differents flows for a flow in business process'; #----------------------------------------------------------------------------- @@ -571,8 +571,8 @@ CREATE TABLE `TASK` `TAS_WIDTH` INTEGER default 110 NOT NULL, `TAS_HEIGHT` INTEGER default 60 NOT NULL, `TAS_COLOR` VARCHAR(32) default '' NOT NULL, - `TAS_EVN_UID` VARCHAR(32) default '' NOT NULL, - `TAS_BOUNDARY` VARCHAR(32) default '' NOT NULL, + `TAS_EVN_UID` VARCHAR(32) default '' NULL, + `TAS_BOUNDARY` VARCHAR(32) default '' NULL, PRIMARY KEY (`TAS_UID`) )Type=MyISAM DEFAULT CHARSET='utf8' COMMENT='Task of workflow'; #----------------------------------------------------------------------------- @@ -1012,8 +1012,8 @@ CREATE TABLE `EVENT` `TRI_UID` VARCHAR(32) default '', `EVN_POSX` INTEGER default 0 NOT NULL, `EVN_POSY` INTEGER default 0 NOT NULL, - `EVN_TYPE` VARCHAR(32) default '', - `TAS_EVN_UID` VARCHAR(32) default '', + `EVN_TYPE` VARCHAR(32) default '' NULL, + `TAS_EVN_UID` VARCHAR(32) default '' NULL, PRIMARY KEY (`EVN_UID`), KEY `indexEventTable`(`EVN_UID`) )Type=MyISAM DEFAULT CHARSET='utf8'; diff --git a/workflow/engine/templates/bpmn/processmap.js b/workflow/engine/templates/bpmn/processmap.js index 014b9615a..834089dec 100755 --- a/workflow/engine/templates/bpmn/processmap.js +++ b/workflow/engine/templates/bpmn/processmap.js @@ -611,7 +611,7 @@ Ext.onReady ( function() { NewShape = eval("new bpmnTask(_4562.workflow)"); NewShape.taskName = shapes.tasks[k][1]; _4562.workflow.addFigure(NewShape, srctaskxpos, srctaskypos); - workflow.setBoundary(NewShape); + //workflow.setBoundary(NewShape); //Setting newshape id to the old shape id NewShape.html.id = shapes.tasks[k][0]; NewShape.id = shapes.tasks[k][0]; @@ -624,7 +624,7 @@ Ext.onReady ( function() { var srcypos = shapes.gateways[k][3]; NewShape = eval("new "+srctype+"(_4562.workflow)"); _4562.workflow.addFigure(NewShape, srcxpos, srcypos); - workflow.setBoundary(NewShape); + // workflow.setBoundary(NewShape); //Setting newshape id to the old shape id NewShape.html.id = shapes.gateways[k][0]; NewShape.id = shapes.gateways[k][0]; @@ -639,7 +639,7 @@ Ext.onReady ( function() { var srceventypos = shapes.events[k][3]; NewShape = eval("new "+srceventtype+"(_4562.workflow)"); _4562.workflow.addFigure(NewShape, srceventxpos, srceventypos); - workflow.setBoundary(NewShape); + // workflow.setBoundary(NewShape); //Setting newshape id to the old shape id NewShape.html.id = shapes.events[k][0]; NewShape.id = shapes.events[k][0]; @@ -658,7 +658,7 @@ Ext.onReady ( function() { workflow.anno_height = height; NewShape = eval("new bpmnAnnotation(_4562.workflow)"); _4562.workflow.addFigure(NewShape, srcannotationxpos, srcannotationypos); - workflow.setBoundary(NewShape); + //workflow.setBoundary(NewShape); //Setting newshape id to the old shape id NewShape.html.id = shapes.annotations[k][0]; NewShape.id = shapes.annotations[k][0]; @@ -673,7 +673,7 @@ Ext.onReady ( function() { _4562.workflow.subProcessName = shapes.subprocess[k][1]; NewShape = eval("new bpmnSubProcess(_4562.workflow)"); _4562.workflow.addFigure(NewShape, srctaskxpos, srctaskypos); - workflow.setBoundary(NewShape); + //workflow.setBoundary(NewShape); //Setting newshape id to the old shape id NewShape.html.id = shapes.subprocess[k][0]; NewShape.id = shapes.subprocess[k][0];