Merged in dheeyi/processmaker/HOR-2211 (pull request #5127)

HOR-2211
This commit is contained in:
Paula Quispe
2016-11-21 18:27:59 +00:00
3 changed files with 21 additions and 10 deletions

1
.gitignore vendored
View File

@@ -38,3 +38,4 @@ update.sh
workflow/public_html/translations/ workflow/public_html/translations/
build-prod.zip build-prod.zip
node_modules node_modules
/workflow/engine/config/system-tables.ini

View File

@@ -2052,6 +2052,9 @@
<column name="DYN_UID" type="VARCHAR" size="32" required="true" default=""/> <column name="DYN_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="REP_TAB_UID" type="VARCHAR" size="32" required="true" default=""/> <column name="REP_TAB_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="CON_STATUS" type="VARCHAR" size="20" required="true" default="ACTIVE"/> <column name="CON_STATUS" type="VARCHAR" size="20" required="true" default="ACTIVE"/>
<index name="indexConStatus">
<index-column name="CON_STATUS"/>
</index>
</table> </table>
<table name="STAGE"> <table name="STAGE">
<vendor type="mysql"> <vendor type="mysql">
@@ -2555,6 +2558,11 @@
<column name="APP_FINISH_DATE" type="TIMESTAMP" required="false"/> <column name="APP_FINISH_DATE" type="TIMESTAMP" required="false"/>
<column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/> <column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_OVERDUE_PERCENTAGE" type="DOUBLE" required="true"/> <column name="APP_OVERDUE_PERCENTAGE" type="DOUBLE" required="true"/>
<index name="indexUsrUidThreadStatusAppStatus">
<index-column name="USR_UID"/>
<index-column name="DEL_THREAD_STATUS"/>
<index-column name="APP_STATUS"/>
</index>
<index name="indexAppUid"> <index name="indexAppUid">
<index-column name="APP_UID"/> <index-column name="APP_UID"/>
</index> </index>

View File

@@ -112,9 +112,9 @@ CREATE TABLE `APP_DOCUMENT`
`APP_DOC_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL, `APP_DOC_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL,
`APP_DOC_STATUS_DATE` DATETIME, `APP_DOC_STATUS_DATE` DATETIME,
`APP_DOC_FIELDNAME` VARCHAR(150), `APP_DOC_FIELDNAME` VARCHAR(150),
`APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT, `APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT,
`SYNC_WITH_DRIVE` VARCHAR(32) default 'UNSYNCHRONIZED' NOT NULL, `SYNC_WITH_DRIVE` VARCHAR(32) default 'UNSYNCHRONIZED' NOT NULL,
`SYNC_PERMISSIONS` MEDIUMTEXT, `SYNC_PERMISSIONS` MEDIUMTEXT,
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`), PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`) KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Documents in an Application'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
@@ -193,8 +193,8 @@ CREATE TABLE `CONTENT`
`CON_LANG` VARCHAR(10) default '' NOT NULL, `CON_LANG` VARCHAR(10) default '' NOT NULL,
`CON_VALUE` MEDIUMTEXT NOT NULL, `CON_VALUE` MEDIUMTEXT NOT NULL,
PRIMARY KEY (`CON_CATEGORY`,`CON_PARENT`,`CON_ID`,`CON_LANG`), PRIMARY KEY (`CON_CATEGORY`,`CON_PARENT`,`CON_ID`,`CON_LANG`),
KEY `indexUidLang`(`CON_ID`, `CON_LANG`), KEY `indexUidLang`(`CON_ID`, `CON_LANG`),
KEY `indexCatParUidLang`(`CON_CATEGORY`, `CON_PARENT`, `CON_ID`, `CON_LANG`), KEY `indexCatParUidLang`(`CON_CATEGORY`, `CON_PARENT`, `CON_ID`, `CON_LANG`),
KEY `indexUid`(`CON_ID`, `CON_CATEGORY`, `CON_LANG`) KEY `indexUid`(`CON_ID`, `CON_CATEGORY`, `CON_LANG`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -462,7 +462,7 @@ CREATE TABLE `PROCESS`
`PRO_COST` DECIMAL(7,2) default 0, `PRO_COST` DECIMAL(7,2) default 0,
`PRO_UNIT_COST` VARCHAR(50) default '', `PRO_UNIT_COST` VARCHAR(50) default '',
`PRO_ITEE` INTEGER default 0 NOT NULL, `PRO_ITEE` INTEGER default 0 NOT NULL,
`PRO_ACTION_DONE` MEDIUMTEXT, `PRO_ACTION_DONE` MEDIUMTEXT,
PRIMARY KEY (`PRO_UID`) PRIMARY KEY (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -765,7 +765,7 @@ CREATE TABLE `USERS`
`USR_DEFAULT_LANG` VARCHAR(10) default '', `USR_DEFAULT_LANG` VARCHAR(10) default '',
`USR_LAST_LOGIN` DATETIME, `USR_LAST_LOGIN` DATETIME,
PRIMARY KEY (`USR_UID`), PRIMARY KEY (`USR_UID`),
KEY `indexUsrUid` (`USR_UID`) KEY `indexUsrUid`(`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- APP_THREAD #-- APP_THREAD
@@ -953,7 +953,8 @@ CREATE TABLE `CASE_CONSOLIDATED`
`DYN_UID` VARCHAR(32) default '' NOT NULL, `DYN_UID` VARCHAR(32) default '' NOT NULL,
`REP_TAB_UID` VARCHAR(32) default '' NOT NULL, `REP_TAB_UID` VARCHAR(32) default '' NOT NULL,
`CON_STATUS` VARCHAR(20) default 'ACTIVE' NOT NULL, `CON_STATUS` VARCHAR(20) default 'ACTIVE' NOT NULL,
PRIMARY KEY (`TAS_UID`) PRIMARY KEY (`TAS_UID`),
KEY `indexConStatus`(`CON_STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- STAGE #-- STAGE
@@ -1025,7 +1026,7 @@ DROP TABLE IF EXISTS `LOGIN_LOG`;
CREATE TABLE `LOGIN_LOG` CREATE TABLE `LOGIN_LOG`
( (
`LOG_ID` INTEGER NOT NULL AUTO_INCREMENT, `LOG_ID` INTEGER NOT NULL AUTO_INCREMENT,
`LOG_UID` VARCHAR(32) default '' NOT NULL, `LOG_UID` VARCHAR(32) default '' NOT NULL,
`LOG_STATUS` VARCHAR(100) default '' NOT NULL, `LOG_STATUS` VARCHAR(100) default '' NOT NULL,
`LOG_IP` VARCHAR(15) default '' NOT NULL, `LOG_IP` VARCHAR(15) default '' NOT NULL,
@@ -1237,6 +1238,7 @@ CREATE TABLE `APP_CACHE_VIEW`
`APP_UPDATE_DATE` DATETIME NOT NULL, `APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL, `APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`), PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexUsrUidThreadStatusAppStatus`(`USR_UID`, `DEL_THREAD_STATUS`, `APP_STATUS`),
KEY `indexAppUid`(`APP_UID`), KEY `indexAppUid`(`APP_UID`),
KEY `indexTasUid`(`TAS_UID`), KEY `indexTasUid`(`TAS_UID`),
KEY `indexUsrUid`(`USR_UID`), KEY `indexUsrUid`(`USR_UID`),
@@ -2714,7 +2716,7 @@ CREATE TABLE `ABE_CONFIGURATION`
`ABE_EMAIL_FIELD` VARCHAR(255) default '' NOT NULL, `ABE_EMAIL_FIELD` VARCHAR(255) default '' NOT NULL,
`ABE_ACTION_FIELD` VARCHAR(255) default '', `ABE_ACTION_FIELD` VARCHAR(255) default '',
`ABE_CASE_NOTE_IN_RESPONSE` INTEGER default 0, `ABE_CASE_NOTE_IN_RESPONSE` INTEGER default 0,
`ABE_FORCE_LOGIN` INTEGER default 0, `ABE_FORCE_LOGIN` INTEGER default 0,
`ABE_CREATE_DATE` DATETIME NOT NULL, `ABE_CREATE_DATE` DATETIME NOT NULL,
`ABE_UPDATE_DATE` DATETIME, `ABE_UPDATE_DATE` DATETIME,
`ABE_SUBJECT_FIELD` VARCHAR(100) default '', `ABE_SUBJECT_FIELD` VARCHAR(100) default '',