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

Merge branch 'master' of bitbucket.org:colosa/processmaker into BUG-14958

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2014-09-25 16:13:41 -04:00
parent 161a5a164f f7ae6e045e
commit 7c69c4e93b
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features/backend/projects/case_scheduler/main_tests_case_scheduler.feature
View File

@@ -20,7 +20,7 @@ Scenario Outline: Get the case schedulers list when there are exactly zero case
| test_description | project | record |
| Get case scheduler of process Test Michelangelo | 1265557095225ff5c688f46031700471 | 0 |
| Get case scheduler of process Process Complete BPMN | 1455892245368ebeb11c1a5001393784 | 0 |
| Get case scheduler of process Process Complete BPMN | 1455892245368ebeb11c1a5001393784 | 1 |
Scenario Outline: Create any case scheduler for a project
@@ -122,7 +122,7 @@ Scenario Outline: Get the case schedulers list when there are exactly 16 case sc
| test_description | project | record |
| Get case scheduler of process Test Michelangelo | 1265557095225ff5c688f46031700471 | 16 |
| Get case scheduler of process Process Complete BPMN | 1455892245368ebeb11c1a5001393784 | 16 |
| Get case scheduler of process Process Complete BPMN | 1455892245368ebeb11c1a5001393784 | 17 |
Scenario Outline: Update the case schedulers for a project and then check if the values had changed

2
features/backend/projects/files_manager/main_test_files_manager.feature
View File

@@ -35,7 +35,7 @@ Scenario Outline: Get a list public folder of process files manager
Examples:
| test_description | project | records |
| Get list of process Test Michelangelo | 1265557095225ff5c688f46031700471 | 0 |
| Get list of process Process Complete BPMN | 1455892245368ebeb11c1a5001393784 | 2 |
| Get list of process Process Complete BPMN | 1455892245368ebeb11c1a5001393784 | 4 |
Scenario Outline: Get a list templates folder of process files manager

2
features/backend/projects/project_export_import/main_tests_project_export_import.feature
View File

@@ -78,7 +78,7 @@ Scenario: Get a list templates folder of process files manager
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "array"
And the response has 1 records
And the response has 2 records
Scenario: Verify that there are report tables
Given I request "project/1455892245368ebeb11c1a5001393784/report-tables"

2
workflow/engine/controllers/adminProxy.php
View File

@@ -186,6 +186,7 @@ class adminProxy extends HttpProxyController
$message = G::loadTranslation('ID_CALENDAR_INVALID_NAME');
break;
}
if (isset($aDefinitions['CALENDAR_NAME'])) {
if ($aDefinitions['CALENDAR_NAME'] != $_POST['name']) {
$validated = true;
} else {
@@ -196,6 +197,7 @@ class adminProxy extends HttpProxyController
}
}
}
}
break;
case 'calendarDates':
$validated = false;

2
workflow/engine/controllers/installer.php
View File

@@ -644,7 +644,7 @@ class Installer extends Controller
$adminPassword = trim( $_REQUEST['adminPassword'] );
$adminUsername = trim( $_REQUEST['adminUsername'] );
$deleteDB = ($_REQUEST['deleteDB'] == 'true');
$userLogged = ($_REQUEST['userLogged'] == 'true');
$userLogged = (isset($_REQUEST['userLogged']) ? ($_REQUEST['userLogged'] == 'true') : false);
if (substr( $pathShared, - 1 ) != '/') {
$pathShared .= '/';

2
workflow/engine/methods/login/authentication.php
View File

@@ -100,7 +100,7 @@ try {
$errLabel = 'WRONG_LOGIN_CREDENTIALS';
}
$_SESSION["USERNAME_PREVIOUS1"] = $_SESSION["USERNAME_PREVIOUS2"];
$_SESSION["USERNAME_PREVIOUS1"] = (isset($_SESSION["USERNAME_PREVIOUS2"]))? $_SESSION["USERNAME_PREVIOUS2"] : "";
$_SESSION["USERNAME_PREVIOUS2"] = $usr;
if (!isset($uid) || $uid < 0) {

2
workflow/engine/methods/setup/appCacheViewAjax.php
View File

@@ -257,7 +257,7 @@ switch ($request) {
$conf->aConfig = $confParams;
$conf->saveConfig( 'APP_CACHE_VIEW_ENGINE', '', '', '' );
$response = new StdClass();
$result = new StdClass();
$result->success = true;
$result->msg = G::LoadTranslation('ID_TITLE_COMPLETED');

2
workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
View File

@@ -209,7 +209,7 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
// the default behavior is to use "username" as the user_id
return array_merge(array(
'user_id' => $username
'user_id' => $userInfo['USR_UID'] //$username
), $userInfo);
}