From ddc09863b304105f116b9bcac8b5090224b5d281 Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Thu, 5 Dec 2024 15:42:14 -0400 Subject: [PATCH 001/130] Fix sort in script executor --- .../Http/Controllers/Api/ScriptExecutorController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php b/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php index e625ac01d8..db4d8794fe 100644 --- a/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php +++ b/ProcessMaker/Http/Controllers/Api/ScriptExecutorController.php @@ -59,7 +59,15 @@ public function index(Request $request) { $this->checkAuth($request); - return new ApiCollection(ScriptExecutor::nonSystem()->get()); + $query = ScriptExecutor::nonSystem(); + + if ($request->has('order_by')) { + $order_by = $request->input('order_by'); + $order_direction = $request->input('order_direction', 'ASC'); + $query->orderBy($order_by, $order_direction); + } + + return new ApiCollection($query->get()); } /** From c6ba4e604c335ea6bfbbc81da82316fe724c8032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Tue, 24 Dec 2024 12:15:37 -0400 Subject: [PATCH 002/130] changed the navbar-icon when expended for mobile --- resources/js/app-layout.js | 4 ++++ resources/views/layouts/navbar.blade.php | 29 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/resources/js/app-layout.js b/resources/js/app-layout.js index c56cf4152d..abf887d29b 100644 --- a/resources/js/app-layout.js +++ b/resources/js/app-layout.js @@ -141,6 +141,7 @@ window.ProcessMaker.navbar = new Vue({ taskTitle: "", isMobile: false, isMobileDevice: window.ProcessMaker.mobileApp, + isNavbarExpanded: false, }; }, watch: { @@ -214,6 +215,9 @@ window.ProcessMaker.navbar = new Vue({ onResize() { this.isMobile = window.innerWidth < 992; }, + toggleNavbar() { + this.isNavbarExpanded = !this.isNavbarExpanded; + }, }, }); diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index 5ce2791f16..e03ba03ed5 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -5,7 +5,13 @@ $loginLogo = \ProcessMaker\Models\Setting::getLogin(); @endphp - + + +
@@ -168,6 +174,27 @@ class="ml-2"
@endsection From a5f6899c992330237259dbd3639018674ff58fa0 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Mon, 15 Sep 2025 11:59:00 -0700 Subject: [PATCH 029/130] Insert TenantBootstrapper after LoadEnvironmentVariables --- ProcessMaker/Application.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ProcessMaker/Application.php b/ProcessMaker/Application.php index 023fc26c4f..38e37d4aff 100644 --- a/ProcessMaker/Application.php +++ b/ProcessMaker/Application.php @@ -5,8 +5,10 @@ use Igaster\LaravelTheme\Facades\Theme; use Illuminate\Filesystem\Filesystem; use Illuminate\Foundation\Application as IlluminateApplication; +use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables; use Illuminate\Foundation\PackageManifest; use Illuminate\Support\Facades\Auth; +use ProcessMaker\Multitenancy\TenantBootstrapper; /** * Class Application. @@ -90,4 +92,15 @@ public function registerConfiguredProviders() parent::registerConfiguredProviders(); } + + public function bootstrapWith(array $bootstrappers) + { + // Insert TenantBootstrapper after LoadEnvironmentVariables + $index = array_search(LoadEnvironmentVariables::class, $bootstrappers); + if ($index !== false) { + array_splice($bootstrappers, $index + 1, 0, [TenantBootstrapper::class]); + } + + return parent::bootstrapWith($bootstrappers); + } } From 8336f3e93bf583a19c57ab64d910a54fdf2689b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustavo=20Bascop=C3=A9?= Date: Mon, 15 Sep 2025 17:58:08 -0400 Subject: [PATCH 030/130] Add translations en.json --- resources/lang/en.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/lang/en.json b/resources/lang/en.json index fddddbc8f6..94d9ac3b08 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -488,6 +488,7 @@ "Count": "Count", "Country Codes": "Country Codes", "Country": "Country", + "Create a new asset even if one with the same name exists": "Create a new asset even if one with the same name exists", "Create a bundle to easily share assets and settings between ProcessMaker instances.": "Create a bundle to easily share assets and settings between ProcessMaker instances.", "Create a new Process": "Create a new Process", "Create a Project": "Create a Project", @@ -677,6 +678,7 @@ "Do you want to delete the tab {{name}}?": "Do you want to delete the tab {{name}}?", "Do you want to delete this image?": "Do you want to delete this image?", "Do you want to delete this rule?": "Do you want to delete this rule?", + "Do you want to proceed with installing the asset on your instance?": "Do you want to proceed with installing the asset on your instance?", "Docker file": "Docker file", "Docker not found.": "Docker not found.", "Document Type": "Document Type", @@ -1123,6 +1125,7 @@ "Input Fields": "Input Fields", "input": "input", "Inspector": "Inspector", + "Installation Mode:": "Installation Mode:", "Installation Progress": "Installation Progress", "Installer completed. Consult ProcessMaker documentation on how to configure email, jobs and notifications.": "Installer completed. Consult ProcessMaker documentation on how to configure email, jobs and notifications.", "Installing ProcessMaker database, OAuth SSL keys and configuration file.": "Installing ProcessMaker database, OAuth SSL keys and configuration file.", @@ -2431,6 +2434,7 @@ "Update Available": "Update Available", "Update Bundle Assets": "Update Bundle Assets", "Update Bundle": "Update Bundle", + "Update existing asset with the same name (recommended)": "Update existing asset with the same name (recommended)", "Update Group Successfully": "Update Group Successfully", "Update Rule": "Update Rule", "Update": "Update", From 32c9d1d74ce75ae4e0856f3851f137b93a06742f Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 16 Sep 2025 09:56:25 -0400 Subject: [PATCH 031/130] Add pagination to panel settings check boxes --- .../settings/components/SettingCheckboxes.vue | 225 +++++++++++++++++- .../settings/components/SettingsListing.vue | 12 +- 2 files changed, 227 insertions(+), 10 deletions(-) diff --git a/resources/js/admin/settings/components/SettingCheckboxes.vue b/resources/js/admin/settings/components/SettingCheckboxes.vue index 9d5ca042f8..32fdbfab69 100644 --- a/resources/js/admin/settings/components/SettingCheckboxes.vue +++ b/resources/js/admin/settings/components/SettingCheckboxes.vue @@ -7,7 +7,7 @@ {{ trimmed(text) }} -