Skip to content

Commit 814a481

Browse files
nolanpronolanpro
committed
Merge branch 'develop' into feature/2887
2 parents 13c3123 + 62d2999 commit 814a481

17 files changed

Lines changed: 127 additions & 641 deletions

File tree

‎ProcessMaker/Events/ScriptBuilderStarting.php‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎ProcessMaker/Http/Controllers/Process/ScreenController.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
use ProcessMaker\Models\Screen;
1212
use ProcessMaker\Models\ScreenCategory;
1313
use ProcessMaker\Models\ScreenType;
14-
use ProcessMaker\Traits\HasControllerAddons;
1514

1615
class ScreenController extends Controller
1716
{
18-
use HasControllerAddons;
19-
2017
/**
2118
* Get the list of screens
2219
*
@@ -66,8 +63,7 @@ public function index(Request $request)
6663
*/
6764
public function edit(Screen $screen)
6865
{
69-
$addons = $this->getPluginAddons('edit', compact(['screen']));
70-
return view('processes.screens.edit', compact('screen', 'addons'));
66+
return view('processes.screens.edit', compact('screen'));
7167
}
7268

7369
/**

‎ProcessMaker/Http/Controllers/Process/ScriptController.php‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,15 @@
44

55
use Illuminate\Http\Request;
66
use Illuminate\Support\Facades\Schema;
7-
use ProcessMaker\Events\ScriptBuilderStarting;
87
use ProcessMaker\Http\Controllers\Controller;
9-
use ProcessMaker\Managers\ScriptBuilderManager;
108
use ProcessMaker\Models\ProcessRequest;
119
use ProcessMaker\Models\Script;
1210
use ProcessMaker\Models\ScriptCategory;
1311
use ProcessMaker\Models\ScriptExecutor;
1412
use ProcessMaker\Models\User;
15-
use ProcessMaker\Traits\HasControllerAddons;
1613

1714
class ScriptController extends Controller
1815
{
19-
use HasControllerAddons;
20-
2116
/**
2217
* Get the list of environment variables
2318
*
@@ -58,26 +53,18 @@ public function edit(Script $script, User $users)
5853
$scriptExecutors = ScriptExecutor::list($script->language);
5954
$addons = $this->getPluginAddons('edit', compact(['script']));
6055

61-
return view('processes.scripts.edit', compact('script', 'selectedUser', 'scriptFormats', 'addons', 'scriptExecutors'));
56+
return view('processes.scripts.edit', compact('script', 'selectedUser', 'addons', 'scriptExecutors'));
6257
}
6358

64-
public function builder(ScriptBuilderManager $manager, Request $request, Script $script)
59+
public function builder(Request $request, Script $script)
6560
{
6661
$processRequestAttributes = $this->getProcessRequestAttributes();
6762
$processRequestAttributes['user_id'] = $request->user()->id;
6863

6964
$testData = [
7065
'_request' => $processRequestAttributes
7166
];
72-
73-
/**
74-
* Emit the ScriptBuilderStarting event, passing in our ScriptBuilderManager instance. This will
75-
* allow packages to add additional javascript for Script Builder initialization which
76-
* can customize the Script Builder controls list.
77-
*/
78-
event(new ScriptBuilderStarting($manager));
79-
80-
return view('processes.scripts.builder', compact('script', 'testData', 'manager'));
67+
return view('processes.scripts.builder', compact('script', 'testData'));
8168
}
8269

8370
private function getProcessRequestAttributes()

‎ProcessMaker/Managers/ScriptBuilderManager.php‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎ProcessMaker/Models/ProcessVersion.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,4 @@ public function process()
7979
{
8080
return $this->belongsTo(Process::class);
8181
}
82-
83-
/**
84-
* Get the associated process
85-
*
86-
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
87-
*/
88-
public function parent()
89-
{
90-
return $this->belongsTo(Process::class, 'process_id', 'id');
91-
}
9282
}

‎ProcessMaker/Models/ScreenVersion.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,4 @@ public function setScreenCategoryIdAttribute($value)
3939
return $this->setMultipleCategories($value, 'screen_category_id');
4040
}
4141

42-
/**
43-
* Get the associated screen
44-
*
45-
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
46-
*/
47-
public function parent()
48-
{
49-
return $this->belongsTo(Screen::class, 'screen_id', 'id');
50-
}
51-
5242
}

‎ProcessMaker/Models/ScriptVersion.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,4 @@ public function setScriptCategoryIdAttribute($value)
3232
{
3333
return $this->setMultipleCategories($value, 'script_category_id');
3434
}
35-
36-
/**
37-
* Get the associated script
38-
*
39-
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
40-
*/
41-
public function parent()
42-
{
43-
return $this->belongsTo(Script::class, 'script_id', 'id');
44-
}
4535
}

‎ProcessMaker/Providers/ProcessMakerServiceProvider.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use ProcessMaker\Managers\ModelerManager;
99
use ProcessMaker\Managers\PackageManager;
1010
use ProcessMaker\Managers\ScreenBuilderManager;
11-
use ProcessMaker\Managers\ScriptBuilderManager;
1211
use ProcessMaker\Events\ScreenBuilderStarting;
1312
use Laravel\Horizon\Horizon;
1413
use Laravel\Passport\Passport;
@@ -88,15 +87,6 @@ public function register()
8887
$this->app->singleton(ScreenBuilderManager::class, function($app) {
8988
return new ScreenBuilderManager();
9089
});
91-
92-
/**
93-
* Maps our Script Builder Manager as a singleton. The Script builder Manager is used
94-
* to manage customizations to the Process Script Builder.
95-
*/
96-
$this->app->singleton(ScriptBuilderManager::class, function($app) {
97-
return new ScriptBuilderManager();
98-
});
99-
10090
// Listen to the events for our core screen types and add our javascript
10191
Event::listen(ScreenBuilderStarting::class, function($event) {
10292
// Add any extensions to form builder/renderer from packages

‎ProcessMaker/Traits/PluginServiceProviderTrait.php‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use Illuminate\Support\Facades\Cache;
77
use Illuminate\Support\Facades\File;
88
use ProcessMaker\Events\ModelerStarting;
9-
use ProcessMaker\Events\ScriptBuilderStarting;
109
use Illuminate\Support\Facades\Event;
1110
use ProcessMaker\Managers\PackageManager;
1211

@@ -19,8 +18,6 @@ trait PluginServiceProviderTrait
1918

2019
private $modelerScripts = [];
2120

22-
private $scriptBuilderScripts = [];
23-
2421
/**
2522
* Boot the PM plug-in.
2623
*/
@@ -35,7 +32,6 @@ protected function completePluginBoot()
3532
$this->registerPackage(static::name);
3633
}
3734
Event::listen(ModelerStarting::class, [$this, 'modelerStarting']);
38-
Event::listen(ScriptBuilderStarting::class, [$this, 'scriptBuilderStarting']);
3935
}
4036

4137
/**
@@ -121,29 +117,4 @@ public function removePackage($package)
121117
{
122118
App::make(PackageManager::class)->remove($package);
123119
}
124-
125-
/**
126-
* Executed during script builder starting
127-
*
128-
* @param \ProcessMaker\Events\ScriptBuilderStarting $event
129-
*/
130-
public function scriptBuilderStarting(ScriptBuilderStarting $event)
131-
{
132-
foreach ($this->scriptBuilderScripts as $path => $public) {
133-
if (File::exists(public_path() . '/' . $public)) {
134-
$event->manager->addScript(mix($path, $public));
135-
}
136-
}
137-
}
138-
139-
/**
140-
* Register a custom javascript for the script builder
141-
*
142-
* @param string $path
143-
* @param string $public
144-
*/
145-
protected function registerJsToScriptBuilder($path, $public)
146-
{
147-
$this->scriptBuilderScripts[$path] = $public;
148-
}
149120
}

0 commit comments

Comments
 (0)