Skip to content

Commit 5086b2e

Browse files
committed
Get process request attributes without using a factory
1 parent cd166f0 commit 5086b2e

1 file changed

Lines changed: 25 additions & 9 deletions

File tree

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

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace ProcessMaker\Http\Controllers\Process;
44

5-
use Illuminate\Support\Facades\Auth;
5+
use Illuminate\Http\Request;
6+
use Illuminate\Support\Facades\Schema;
67
use ProcessMaker\Http\Controllers\Controller;
78
use ProcessMaker\Models\ProcessRequest;
89
use ProcessMaker\Models\Script;
@@ -48,18 +49,33 @@ public function edit(Script $script, User $users)
4849
return view('processes.scripts.edit', compact('script', 'selectedUser', 'scriptFormats'));
4950
}
5051

51-
public function builder(Script $script)
52+
public function builder(Request $request, Script $script)
5253
{
5354
$scriptFormat = $script->language_name;
55+
$processRequestAttributes = $this->getProcessRequestAttributes();
56+
$processRequestAttributes['user_id'] = $request->user()->id;
57+
5458
$testData = [
55-
'_request' => factory(ProcessRequest::class)->raw([
56-
'callable_id' => 'process_1',
57-
'user_id' => Auth::id(),
58-
'process_id' => 1,
59-
'process_collaboration_id' => 1,
60-
]),
59+
'_request' => $processRequestAttributes
6160
];
62-
6361
return view('processes.scripts.builder', compact('script', 'scriptFormat', 'testData'));
6462
}
63+
64+
private function getProcessRequestAttributes()
65+
{
66+
$emptyProcessRequest = new ProcessRequest();
67+
$columns = Schema::connection(
68+
$emptyProcessRequest->getConnectionName()
69+
)->getColumnListing(
70+
$emptyProcessRequest->getTable()
71+
);
72+
73+
$attributes = [];
74+
75+
foreach($columns as $column) {
76+
$attributes[$column] = null;
77+
}
78+
79+
return $attributes;
80+
}
6581
}

0 commit comments

Comments
 (0)