fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into BUG-14990

Browse Source
This commit is contained in:
jennylee
2014-09-03 17:19:47 -04:00
parent e3be85a929 305c462fd5
commit ce1ca3b2ea
13 changed files with 816 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@@ -226,6 +226,7 @@ def buildMafe(homeDir, targetDir, mode)
puts "\nCopying files into: #{mafeDir}".bold
copyFiles({
"#{homeDir}/lib/jQueryUI/images/*.png" => "#{cssTargetDir}/images/",
"#{homeDir}/build/js/designer.js" => "#{mafeDir}/designer.min.js",
"#{homeDir}/build/js/mafe.js" => "#{mafeDir}/mafe.min.js",
"#{homeDir}/build/css/mafe.css" => "#{mafeDir}/mafe.min.css",

166
features/backend/projects/database_connections/main_tests_database_connections_mysql.feature Normal file
View File

@@ -0,0 +1,166 @@
@ProcessMakerMichelangelo @RestAPI
Feature: DataBase Connections Main Tests MySQL
Requirements:
a workspace with the process 74737540052e1641ab88249082085472 ("Data Base Connenctions") already loaded
and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded
there are zero Database Connections in the process
Background:
Given that I have a valid access_token
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
Given I request "project/<project>/database-connections"
Then the response status code should be 200
And the response charset is "UTF-8"
And the response has <record> record
Examples:
| test_description | project | record |
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 |
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 |
Scenario Outline: Test database connection to test
Given POST this data:
"""
{
"dbs_type": "<dbs_type>",
"dbs_server": "<dbs_server>",
"dbs_database_name": "<dbs_database_name>",
"dbs_username": "<dbs_username>",
"dbs_password": "<dbs_password>",
"dbs_port": <dbs_port>,
"dbs_encode": "<dbs_encode>",
"dbs_description": "<dbs_description>"
}
"""
And I request "project/<project>/database-connection/test"
Then if database-connection is active continue
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Test SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
| Test SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
Scenario Outline: Create a new database connection
Given POST this data:
"""
{
"dbs_type": "<dbs_type>",
"dbs_server": "<dbs_server>",
"dbs_database_name": "<dbs_database_name>",
"dbs_username": "<dbs_username>",
"dbs_password": "<dbs_password>",
"dbs_port": <dbs_port>,
"dbs_encode": "<dbs_encode>",
"dbs_description": "<dbs_description>"
}
"""
And I request "project/<project>/database-connection"
Then the response status code should be 201
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "dbs_uid" in session array as variable "dbs_uid_<dbs_uid_number>"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Create SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
| Create SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process
Given I request "project/<project>/database-connections"
Then the response status code should be 200
And the response charset is "UTF-8"
And the response has <record> record
Examples:
| test_description | project | record |
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 1 |
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 1 |
Scenario Outline: Update a database connection
Given PUT this data:
"""
{
"dbs_type": "<dbs_type>",
"dbs_server": "<dbs_server>",
"dbs_database_name": "<dbs_database_name>",
"dbs_username": "<dbs_username>",
"dbs_password": "<dbs_password>",
"dbs_port": <dbs_port>,
"dbs_encode": "<dbs_encode>",
"dbs_description": "<dbs_description>"
}
"""
And that I want to update a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
And I request "project/<project>/database-connection"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "object"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
Scenario Outline: Get a single database connection and check some properties
Given that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
And I request "project/<project>/database-connection"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "object"
And that "dbs_type" is set to "<dbs_type>"
And that "dbs_server" is set to "<dbs_server>"
And that "dbs_database_name" is set to "<dbs_database_name>"
And that "dbs_username" is set to "<dbs_username>"
And that "dbs_password" is set to "<dbs_password>"
And that "dbs_port" is set to "<dbs_port>"
And that "dbs_encode" is set to "<dbs_encode>"
And that "dbs_description" is set to "<dbs_description>"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
Scenario Outline: Delete all Database Connection created previously in this script
Given that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
And I request "project/<project>/database-connection"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "object"
Examples:
| project | dbs_uid_number |
| 74737540052e1641ab88249082085472 | 1 |
| 87648819953a85c0abc01d3080475981 | 2 |
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
Given I request "project/<project>/database-connections"
Then the response status code should be 200
And the response charset is "UTF-8"
And the response has <record> record
Examples:
| test_description | project | record |
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 |
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 |

171
features/backend/projects/database_connections/main_tests_database_connections_sqlserver.feature Normal file
View File

@@ -0,0 +1,171 @@
@ProcessMakerMichelangelo @RestAPI
Feature: DataBase Connections Main Tests SQL Server
Requirements:
a workspace with the process 74737540052e1641ab88249082085472 ("Data Base Connenctions") already loaded
and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded
there are zero Database Connections in the processes
Background:
Given that I have a valid access_token
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
Given I request "project/<project>/database-connections"
Then the response status code should be 200
And the response charset is "UTF-8"
And the response has <record> record
Examples:
| test_description | project | record |
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 |
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 |
Scenario Outline: Test database connection to test
Given POST this data:
"""
{
"dbs_type": "<dbs_type>",
"dbs_server": "<dbs_server>",
"dbs_database_name": "<dbs_database_name>",
"dbs_username": "<dbs_username>",
"dbs_password": "<dbs_password>",
"dbs_port": <dbs_port>,
"dbs_encode": "<dbs_encode>",
"dbs_description": "<dbs_description>"
}
"""
And I request "project/<project>/database-connection/test"
Then if database-connection with id "<dbs_uid_number>" is active
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Test SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
| Test SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
Scenario Outline: Create a new database connection
Given database-connection with id "<dbs_uid_number>" is active
And POST this data:
"""
{
"dbs_type": "<dbs_type>",
"dbs_server": "<dbs_server>",
"dbs_database_name": "<dbs_database_name>",
"dbs_username": "<dbs_username>",
"dbs_password": "<dbs_password>",
"dbs_port": <dbs_port>,
"dbs_encode": "<dbs_encode>",
"dbs_description": "<dbs_description>"
}
"""
And I request "project/<project>/database-connection"
Then the response status code should be 201
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
And store "dbs_uid" in session array as variable "dbs_uid_<dbs_uid_number>"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Create SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
| Create SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process
Given database-connection with id "<dbs_uid_number>" is active
And I request "project/<project>/database-connections"
Then the response status code should be 200
And the response charset is "UTF-8"
And the response has <record> record
Examples:
| test_description | project | record | dbs_uid_number |
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 1 | 1 |
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 1 | 2 |
Scenario Outline: Update a database connection
Given database-connection with id "<dbs_uid_number>" is active
And PUT this data:
"""
{
"dbs_type": "<dbs_type>",
"dbs_server": "<dbs_server>",
"dbs_database_name": "<dbs_database_name>",
"dbs_username": "<dbs_username>",
"dbs_password": "<dbs_password>",
"dbs_port": <dbs_port>,
"dbs_encode": "<dbs_encode>",
"dbs_description": "<dbs_description>"
}
"""
And that I want to update a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
And I request "project/<project>/database-connection"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "object"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
Scenario Outline: Get a single database connection and check some properties
Given database-connection with id "<dbs_uid_number>" is active
And that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
And I request "project/<project>/database-connection"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "object"
And that "dbs_type" is set to "<dbs_type>"
And that "dbs_server" is set to "<dbs_server>"
And that "dbs_database_name" is set to "<dbs_database_name>"
And that "dbs_username" is set to "<dbs_username>"
And that "dbs_password" is set to "<dbs_password>"
And that "dbs_port" is set to "<dbs_port>"
And that "dbs_encode" is set to "<dbs_encode>"
And that "dbs_description" is set to "<dbs_description>"
Examples:
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
Scenario Outline: Delete all Database Connection created previously in this script
Given database-connection with id "<dbs_uid_number>" is active
And that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
And I request "project/<project>/database-connection"
Then the response status code should be 200
And the response charset is "UTF-8"
And the type is "object"
Examples:
| project | dbs_uid_number |
| 74737540052e1641ab88249082085472 | 1 |
| 87648819953a85c0abc01d3080475981 | 2 |
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
Given database-connection with id "<dbs_uid_number>" is active
And I request "project/<project>/database-connections"
Then the response status code should be 200
And the response charset is "UTF-8"
And the response has <record> record
Examples:
| test_description | project | record | dbs_uid_number |
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | 1 |
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | 2 |

60
features/bootstrap/RestContext.php
View File

@@ -1769,4 +1769,64 @@ class RestContext extends BehatContext
$fp = fopen(sys_get_temp_dir() . "/behat.log", "a+");
fwrite($fp, $string . PHP_EOL);
}
/**
* @Then /^if database-connection with id "([^"]*)" is active$/
*/
public function ifDatabaseConnectionWithIdIsActive($dbConnectionId)
{
if(!(isset($this->_response))){
throw new \Exception('Empty result ' );
}
$message="";
$sw_error=false;
if($bodyResponse=json_decode($this->_response->getBody(true))){
//print_r($bodyResponse);
foreach($bodyResponse as $testDetail){
$message.=$testDetail->test;
if(isset($testDetail->error)){
$sw_error=true;
$message .= " -> ".$testDetail->error;
}else{
$message.=" -> [OK]";
}
$message.=" | ";
}
}else{
throw new \Exception('Empty result ' );
}
if (file_exists("session.data")) {
$sessionData = json_decode(file_get_contents("session.data"));
} else {
$sessionData = new StdClass();
}
if(!isset($sessionData->dbconnectionStatus)){
$sessionData->dbconnectionStatus = new StdClass();
}
$sessionData->dbconnectionStatus->$dbConnectionId = !$sw_error;
file_put_contents("session.data", json_encode($sessionData));
if($sw_error){
throw new PendingException($message);
}
}
/**
* @Given /^database-connection with id "([^"]*)" is active$/
*/
public function databaseConnectionWithIdIsActive($dbConnectionId)
{
if (file_exists("session.data")) {
$sessionData = json_decode(file_get_contents("session.data"));
} else {
$sessionData = new StdClass();
}
if(!$sessionData->dbconnectionStatus->$dbConnectionId){
throw new PendingException("Skip inactive dbconnection: $dbConnectionId");
}
}
}

4
gulliver/system/class.g.php
View File

@@ -4385,7 +4385,7 @@ class G
}
// Next get the name of the useragent yes seperately and for good reason
if (preg_match( '/MSIE/i', $u_agent ) && ! preg_match( '/Opera/i', $u_agent )) {
if ((preg_match('~Trident/7.0; rv:11.0~',$_SERVER["HTTP_USER_AGENT"]) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) {
$bname = 'Internet Explorer';
$ub = "MSIE";
} elseif (preg_match( '/Firefox/i', $u_agent )) {
@@ -4419,7 +4419,7 @@ class G
if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) {
$version = $matches['version'][0];
} else {
$version = $matches['version'][1];
$version = isset($matches['version'][1]) ? $matches['version'][1] : '';
}
} else {
$version = $matches['version'][0];

23
rbac/engine/classes/model/Roles.php
View File

@@ -64,7 +64,7 @@ class Roles extends BaseRoles {
$this->setNew(false);
$this->getRolName();
$aFields['ROL_NAME'] = $this->rol_name;
$aFields['ROL_NAME'] = ($this->rol_name != '' ? $this->rol_name: $this->getRolCode());
return $aFields;
} else {
@@ -83,11 +83,14 @@ class Roles extends BaseRoles {
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aRow = $oDataset->getRow();
$roles = new Roles();
$roles->load($aRow['ROL_UID']);
$aRow['ROL_NAME'] = $roles->getRolName();
if ($aRow['ROL_NAME'] == '') {
$aRow['ROL_NAME'] = $roles->getRolCode();
}
if (is_array($aRow)) {
return $aRow;
} else {
@@ -159,16 +162,16 @@ class Roles extends BaseRoles {
$oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != '') {
$oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
}
$oCriteria->setOffset($start);
$oCriteria->setLimit($limit);
$result['LIST'] = $oCriteria;
return $result;
}
@@ -183,6 +186,9 @@ class Roles extends BaseRoles {
$o = new Roles();
$o->load($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
$aRows[] = $row;
}
return $aRows;
@@ -320,6 +326,9 @@ class Roles extends BaseRoles {
if (is_array($row)) {
$o = RolesPeer::retrieveByPK($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
return $row;
} else {
return null;

60
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker 2.5.2.3\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2014-08-21 17:02:40\n"
"PO-Revision-Date: 2014-09-02 10:32:26\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -12616,8 +12616,8 @@ msgstr "The current password is incorrect"
# TRANSLATION
# LABEL/ID_MAX_LIFETIME
#: LABEL/ID_MAX_LIFETIME
msgid "Maximum lifetime cleaned up (ms)"
msgstr "Maximum lifetime cleaned up (ms)"
msgid "Cookie lifetime (seconds)"
msgstr "Cookie lifetime (seconds)"
# TRANSLATION
# LABEL/ID_SUCCESSFUL_CONNECTION
@@ -13204,8 +13204,8 @@ msgstr "xxx"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5
msgid "ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it."
msgstr "ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it."
msgid "ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login."
msgstr "ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login."
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2
@@ -13558,8 +13558,8 @@ msgstr "Pre-installation check"
# TRANSLATION
# LABEL/ID_DIRECTORY_FILE_PERMISSION
#: LABEL/ID_DIRECTORY_FILE_PERMISSION
msgid "Directory File Permission"
msgstr "Directory File Permission"
msgid "File Permisions"
msgstr "File Permisions"
# TRANSLATION
# LABEL/ID_DATA_CORRECT
@@ -16396,8 +16396,8 @@ msgstr "Use the language of URL"
# TRANSLATION
# LABEL/ID_SUMMARY_FORM_NO_PERMISSIONS
#: LABEL/ID_SUMMARY_FORM_NO_PERMISSIONS
msgid "You do not have permission to summary form"
msgstr "You do not have permission to summary form"
msgid "You do not have permission to have access to the summary form"
msgstr "You do not have permission to have access to the summary form"
# TRANSLATION
# LABEL/ID_SUMMARY_FORM
@@ -16411,6 +16411,48 @@ msgstr "Summary form"
msgid "You can't delete the default language."
msgstr "You can't delete the default language."
# TRANSLATION
# LABEL/ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT
#: LABEL/ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT
msgid "The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls"
msgstr "The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls"
# TRANSLATION
# LABEL/ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION
#: LABEL/ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION
msgid "The file has not been attached because the extension is not allowed or because it doesn't correspond to the content of it."
msgstr "The file has not been attached because the extension is not allowed or because it doesn't correspond to the content of it."
# TRANSLATION
# LABEL/ID_INPUT_DOC_TYPE_FILE_REQUIRED
#: LABEL/ID_INPUT_DOC_TYPE_FILE_REQUIRED
msgid "You must specify the allowed file extensions, use *.* to allow any extension."
msgstr "You must specify the allowed file extensions, use *.* to allow any extension."
# TRANSLATION
# LABEL/ID_TINY_SYSTEM_VARIABLE
#: LABEL/ID_TINY_SYSTEM_VARIABLE
msgid "System Variable"
msgstr "System Variable"
# TRANSLATION
# LABEL/ID_CHOOSE_PROVIDER
#: LABEL/ID_CHOOSE_PROVIDER
msgid "Please select provider"
msgstr "Please select provider"
# TRANSLATION
# LABEL/ID_INDEX
#: LABEL/ID_INDEX
msgid "Index"
msgstr "Index"
# TRANSLATION
# LABEL/ID_ERROR_JS_NOT_AVAILABLE
#: LABEL/ID_ERROR_JS_NOT_AVAILABLE
msgid "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used."
msgstr "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used."
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

322
workflow/engine/data/mssql/insert.sql
View File

File diff suppressed because it is too large Load Diff

305
workflow/engine/data/mysql/insert.sql
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/methods/users/users_Ajax.php
View File

@@ -456,7 +456,7 @@ try {
}
$row['USR_ROLE_ID'] = $row['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE'];
$row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
$row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';

5
workflow/engine/skinEngine/simplified/templates/index.html
View File

@@ -31,13 +31,12 @@
var h = $(window).height() - 42;
$('iframe').height(h);
//IE V10-V11
if (navigator.appVersion.indexOf("MSIE 1") != -1) {
if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) {
h = $('iframe').attr('style');
$('iframe').attr('style', h+' padding-top : 40px;');
}
}
function redirect(url)
{
var $iframe = $('#iframex');

7
workflow/engine/templates/cases/cases_Load.php
View File

@@ -18,16 +18,15 @@
document.documentElement.style.overflowY = 'hidden';
var oClientWinSize = getClientWindowSize();
function autoResizeScreen() {
oCasesFrame = document.getElementById('casesFrame');
height = getClientWindowSize().height-90;
oCasesFrame.style.height = height;
oCasesFrame.style.height = height + 'px';;
oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
if(oCasesSubFrame){
oCasesSubFrame.style.height = height-5;
oCasesSubFrame.style.height = (height-5) + 'px';;
}
else {
setTimeout('autoResizeScreen()', 2000);

3
workflow/engine/templates/home/index.html
View File

@@ -33,11 +33,10 @@
var h = $(window).height() - 42;
$('iframe').height(h);
//IE V10-V11
if (navigator.appVersion.indexOf("MSIE 1") != -1) {
if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) {
h = $('iframe').attr('style');
$('iframe').attr('style', h+' padding-top : 40px;');
}
}
function redirect(url)