Skip to content

Commit acd1d93

Browse files
pmPaulispmPaulis
committed
Merge remote-tracking branch 'origin/develop' into epic/FOUR-22605
2 parents 30200b8 + 4fe5efa commit acd1d93

8 files changed

Lines changed: 51 additions & 34 deletions

File tree

‎ProcessMaker/Http/Controllers/Api/SettingController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,8 @@ public function update(Setting $setting, Request $request)
263263
]);
264264
// set to cache with key and setting
265265
$settingCache->set($key, $setting->refresh());
266+
// update config
267+
config([$setting->key => $setting->config]);
266268

267269
return response([], 204);
268270
}

‎ProcessMaker/Http/Controllers/Api/V1_1/ProcessVariableController.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,6 @@ public function getProcessesVariables(array $processIds, $excludeSavedSearch, $p
249249
DB::raw('NULL AS `default`'),
250250
]);
251251

252-
if (!empty($activeColumns)) {
253-
$activeColumns = array_map(function ($column) {
254-
return preg_replace('/^data\./', '', $column);
255-
}, $activeColumns);
256-
$query->whereNotIn('vfv.field', $activeColumns);
257-
}
258-
259252
// Return the paginated result
260253
$paginator = $query->paginate($perPage, ['*'], 'page', $page);
261254

‎ProcessMaker/Repositories/SettingsConfigRepository.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private function getFromSettings($key)
8787
$setting = Setting::byKey($key);
8888

8989
if ($setting !== null) {
90+
Arr::set($this->items, $key, $setting->config);
9091
return $setting->config;
9192
}
9293

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "processmaker/processmaker",
3-
"version": "4.15.2+beta-1",
3+
"version": "4.15.3+beta-1",
44
"description": "BPM PHP Software",
55
"keywords": [
66
"php bpm processmaker"
@@ -105,7 +105,7 @@
105105
"Gmail"
106106
],
107107
"processmaker": {
108-
"build": "36bb677e",
108+
"build": "76719b31",
109109
"cicd-enabled": true,
110110
"custom": {
111111
"package-ellucian-ethos": "1.19.3",
@@ -152,11 +152,11 @@
152152
"package-advanced-user-manager": "1.13.0",
153153
"package-ai": "1.16.5",
154154
"package-analytics-reporting": "1.11.0",
155-
"package-auth": "1.24.3",
155+
"package-auth": "1.24.4",
156156
"package-collections": "2.25.4",
157157
"package-comments": "1.16.0",
158158
"package-conversational-forms": "1.15.0",
159-
"package-data-sources": "1.34.0",
159+
"package-data-sources": "1.34.1",
160160
"package-decision-engine": "1.16.1",
161161
"package-dynamic-ui": "1.28.1",
162162
"package-files": "1.23.0",
@@ -168,7 +168,7 @@
168168
"package-product-analytics": "1.5.10",
169169
"package-projects": "1.12.3",
170170
"package-rpa": "1.1.1",
171-
"package-savedsearch": "1.42.6",
171+
"package-savedsearch": "1.42.8",
172172
"package-slideshow": "1.4.2",
173173
"package-sentry": "1.12.0",
174174
"package-signature": "1.15.0",

‎composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@processmaker/processmaker",
3-
"version": "4.15.2",
3+
"version": "4.15.3",
44
"description": "ProcessMaker 4",
55
"author": "DevOps <devops@processmaker.com>",
66
"license": "ISC",
@@ -60,9 +60,9 @@
6060
"@fortawesome/free-solid-svg-icons": "^5.15.1",
6161
"@fortawesome/vue-fontawesome": "^0.1.9",
6262
"@panter/vue-i18next": "^0.15.2",
63-
"@processmaker/modeler": "1.69.1",
63+
"@processmaker/modeler": "1.69.2",
6464
"@processmaker/processmaker-bpmn-moddle": "0.16.0",
65-
"@processmaker/screen-builder": "3.7.0",
65+
"@processmaker/screen-builder": "3.8.0",
6666
"@processmaker/vue-form-elements": "0.65.0",
6767
"@processmaker/vue-multiselect": "2.3.0",
6868
"@tinymce/tinymce-vue": "2.0.0",

‎tests/Repositories/SettingsConfigRepositoryTest.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Cache\CacheManager;
66
use Illuminate\Cache\Repository;
77
use Illuminate\Support\Facades\Cache;
8+
use ProcessMaker\Cache\Settings\SettingCacheFactory;
89
use ProcessMaker\Models\Setting;
910
use Tests\TestCase;
1011

@@ -20,4 +21,24 @@ public function testDotNotation()
2021

2122
$this->assertEquals('the value', config('test.dot.notation'));
2223
}
24+
25+
public function testCachesValueSimple()
26+
{
27+
// "collections.<id>.obfuscate" is a key generated in "Records" model in collection package
28+
Setting::create([
29+
'key' => 'collections.6.obfuscate',
30+
'config' => 'foo',
31+
'format' => 'text',
32+
]);
33+
34+
$this->assertEquals('foo', config('collections.6.obfuscate'));
35+
36+
// Update the setting directly in DB and Redis Cache to simulate external change
37+
Setting::where('key', 'collections.6.obfuscate')->update(['config' => 'bar']);
38+
$settingCache = SettingCacheFactory::getSettingsCache();
39+
$settingCache->clear();
40+
41+
// Should still return Class cached value, not updated one
42+
$this->assertEquals('foo', config('collections.6.obfuscate'));
43+
}
2344
}

0 commit comments

Comments
 (0)