Skip to content

Commit 83092ea

Browse files
committed
Hide Lua and R Script Executors
1 parent f728483 commit 83092ea

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@ public function availableLanguages()
347347
{
348348
$languages = [];
349349
foreach (Script::scriptFormats() as $key => $config) {
350+
if (in_array($key, Script::deprecatedLanguages)) {
351+
continue;
352+
}
350353
if (!array_key_exists('system', $config) || (array_key_exists('system', $config) && !$config['system'])) {
351354
$languages[] = [
352355
'value' => $key,

‎ProcessMaker/Models/Script.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ class Script extends ProcessMakerModel implements ScriptInterface
7373

7474
const categoryClass = ScriptCategory::class;
7575

76+
const deprecatedLanguages = ['lua', 'r'];
77+
7678
protected $connection = 'processmaker';
7779

7880
protected $guarded = [

‎ProcessMaker/Models/ScriptExecutor.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ class ScriptExecutor extends ProcessMakerModel
5959
'title', 'description', 'language', 'config', 'is_system',
6060
];
6161

62+
// Lua and R are deprecated. This scope can be removed
63+
// when they are removed permanently.
64+
public function scopeActive($query)
65+
{
66+
return $query->whereNotIn('language', Script::deprecatedLanguages);
67+
}
68+
6269
public static function install($params)
6370
{
6471
$language = $params['language'];
@@ -153,7 +160,7 @@ public static function list($language = null, $forEditMode = false)
153160
{
154161
$list = [];
155162
$executors =
156-
self::where('is_system', false)->orderBy('language', 'asc')
163+
self::active()->where('is_system', false)->orderBy('language', 'asc')
157164
->orderBy('created_at', 'asc');
158165

159166
if ($language) {

0 commit comments

Comments
 (0)