@@ -6,7 +6,6 @@ |
||
6 | 6 | use Validator; |
7 | 7 | use Illuminate\Http\Request; |
8 | 8 | use Illuminate\Support\Facades\Log; |
9 | - |
|
10 | 9 | use Taskforcedev\LaravelSupport\Http\Controllers\Controller; |
11 | 10 | use Taskforcedev\CrudApi\Helpers\CrudApi; |
12 | 11 | use Illuminate\Database\Eloquent\ModelNotFoundException; |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $fqModel = $this->apiHelper->getModel(); |
35 | 35 | |
36 | 36 | if (Auth::user()->cannot('create', $fqModel)) { |
37 | - Log::info('CrudAPI: User is unable to create: ' . $fqModel); |
|
37 | + Log::info('CrudAPI: User is unable to create: '.$fqModel); |
|
38 | 38 | return redirect('/'); |
39 | 39 | } |
40 | 40 |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | private function modalUrl($type) |
133 | 133 | { |
134 | 134 | switch ($type) { |
135 | - case 'edit': |
|
136 | - $action = 'update'; |
|
137 | - break; |
|
138 | - default: |
|
139 | - $action = $type; |
|
140 | - break; |
|
135 | + case 'edit': |
|
136 | + $action = 'update'; |
|
137 | + break; |
|
138 | + default: |
|
139 | + $action = $type; |
|
140 | + break; |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | return route('crudapi.'.$action.'.item', $this->model); |
@@ -159,32 +159,32 @@ discard block |
||
159 | 159 | $output = ''; |
160 | 160 | |
161 | 161 | switch ($type) { |
162 | - case 'form-create': |
|
163 | - $output .= $this->fieldHelper->formCreate($fields); |
|
164 | - break; |
|
165 | - case 'form-edit': |
|
166 | - $output .= $this->fieldHelper->formEdit($fields); |
|
167 | - break; |
|
168 | - case 'table-headings': |
|
169 | - $output .= $this->fieldHelper->tableHeadings($fields); |
|
170 | - break; |
|
171 | - case 'table-content': |
|
172 | - $output .= $this->fieldHelper->tableContent($fields, $this->instance); |
|
173 | - break; |
|
174 | - // JavaScript Variables |
|
175 | - case 'js-var': |
|
176 | - foreach ($fields as $f) { |
|
177 | - $output .= 'var '.$f.' = '.$this->instance->$f.'; '; |
|
178 | - } |
|
179 | - break; |
|
180 | - case 'js-modal-create': |
|
181 | - foreach ($fields as $f) { |
|
182 | - $output .= '"'.$f.'": $(\'#createItem'.$f.'\').val(), '; |
|
183 | - } |
|
184 | - break; |
|
185 | - default: |
|
186 | - return; |
|
162 | + case 'form-create': |
|
163 | + $output .= $this->fieldHelper->formCreate($fields); |
|
164 | + break; |
|
165 | + case 'form-edit': |
|
166 | + $output .= $this->fieldHelper->formEdit($fields); |
|
167 | + break; |
|
168 | + case 'table-headings': |
|
169 | + $output .= $this->fieldHelper->tableHeadings($fields); |
|
170 | + break; |
|
171 | + case 'table-content': |
|
172 | + $output .= $this->fieldHelper->tableContent($fields, $this->instance); |
|
173 | + break; |
|
174 | + // JavaScript Variables |
|
175 | + case 'js-var': |
|
176 | + foreach ($fields as $f) { |
|
177 | + $output .= 'var '.$f.' = '.$this->instance->$f.'; '; |
|
178 | + } |
|
179 | + break; |
|
180 | + case 'js-modal-create': |
|
181 | + foreach ($fields as $f) { |
|
182 | + $output .= '"'.$f.'": $(\'#createItem'.$f.'\').val(), '; |
|
183 | + } |
|
187 | 184 | break; |
185 | + default: |
|
186 | + return; |
|
187 | + break; |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | echo $output; |
@@ -258,17 +258,17 @@ discard block |
||
258 | 258 | $class = get_class($field); |
259 | 259 | |
260 | 260 | switch ($class) { |
261 | - case 'App\\Helpers\\CrudApi': |
|
262 | - break; |
|
263 | - case 'App\\Indicator': |
|
264 | - return $field->indicator; |
|
265 | - break; |
|
266 | - case 'Taskforcedev\\CrudApi\\Helpers\\CrudApi': |
|
267 | - return false; |
|
268 | - break; |
|
269 | - default: |
|
270 | - return $field->name; |
|
261 | + case 'App\\Helpers\\CrudApi': |
|
271 | 262 | break; |
263 | + case 'App\\Indicator': |
|
264 | + return $field->indicator; |
|
265 | + break; |
|
266 | + case 'Taskforcedev\\CrudApi\\Helpers\\CrudApi': |
|
267 | + return false; |
|
268 | + break; |
|
269 | + default: |
|
270 | + return $field->name; |
|
271 | + break; |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 |
@@ -32,6 +32,9 @@ discard block |
||
32 | 32 | $this->fieldHelper = new Field($this); |
33 | 33 | } |
34 | 34 | |
35 | + /** |
|
36 | + * @param string $modelHelper |
|
37 | + */ |
|
35 | 38 | public function setModelHelper($modelHelper) |
36 | 39 | { |
37 | 40 | $this->modelHelper = $modelHelper; |
@@ -90,6 +93,9 @@ discard block |
||
90 | 93 | return $filtered_fields; |
91 | 94 | } |
92 | 95 | |
96 | + /** |
|
97 | + * @return string |
|
98 | + */ |
|
93 | 99 | public function getModelDisplayName() |
94 | 100 | { |
95 | 101 | $instance = $this->getModelInstance(); |