@@ -2,6 +2,6 @@ |
||
2 | 2 | if (!isset($uiframework) || $uiframework == 'bs3') { |
3 | 3 | $uiframework = 'bs4'; |
4 | 4 | } |
5 | -$adminIndex = 'crudapi::admin.' . $uiframework . '.index'; |
|
5 | +$adminIndex = 'crudapi::admin.'.$uiframework.'.index'; |
|
6 | 6 | ?> |
7 | 7 | @include($adminIndex) |
8 | 8 | \ No newline at end of file |
@@ -43,13 +43,13 @@ |
||
43 | 43 | var id = button.data('id'); |
44 | 44 | <?php |
45 | 45 | foreach ($fields as $field) { |
46 | - echo 'var ' . $field . ' = button.data(\'' . $field . '\');' . "\n"; |
|
46 | + echo 'var '.$field.' = button.data(\''.$field.'\');'."\n"; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | foreach ($fields as $field) { |
50 | 50 | $ucfield = ucfirst($field); |
51 | 51 | if ($apiHelper->fieldHelper->isIdField($field)) { |
52 | - echo "$('#editItem{$ucfield} option[value=' +{$field} +']').attr('selected', 'selected'); " . "\n"; |
|
52 | + echo "$('#editItem{$ucfield} option[value=' +{$field} +']').attr('selected', 'selected'); "."\n"; |
|
53 | 53 | } else { |
54 | 54 | echo "$('#editItem{$ucfield}').val({$field});\n"; |
55 | 55 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | <table class="table"> |
12 | 12 | <?php |
13 | 13 | foreach ($fields as $field) { |
14 | - echo "<tr><td>{$field}</td><td><span id=\"deletedItem" . ucfirst($field) . "\"></span></td></tr>"; |
|
14 | + echo "<tr><td>{$field}</td><td><span id=\"deletedItem".ucfirst($field)."\"></span></td></tr>"; |
|
15 | 15 | } |
16 | 16 | ?> |
17 | 17 | </table> |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | "_token": "{{ csrf_token() }}" |
25 | 25 | } |
26 | 26 | |
27 | - $('#<?php echo $modal_id;?>').modal('hide'); |
|
27 | + $('#<?php echo $modal_id; ?>').modal('hide'); |
|
28 | 28 | |
29 | 29 | /* Send the post request */ |
30 | 30 | @if(isset($done)) |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | } |
41 | 41 | </script> |
42 | 42 | <script> |
43 | - $('#<?php echo $modal_id;?>').on('show.bs.modal', function (event) { |
|
43 | + $('#<?php echo $modal_id; ?>').on('show.bs.modal', function (event) { |
|
44 | 44 | var button = $(event.relatedTarget) // Button that triggered the modal |
45 | 45 | |
46 | 46 | var id = button.data('id'); |
47 | 47 | <?php |
48 | 48 | foreach ($fields as $field) { |
49 | - echo 'var ' . $field . ' = button.data(\'' . $field . '\')' . "\n"; |
|
49 | + echo 'var '.$field.' = button.data(\''.$field.'\')'."\n"; |
|
50 | 50 | } ?> |
51 | 51 | |
52 | 52 | //var recipient = button.data('whatever') // Extract info from data-* attributes |
@@ -6,7 +6,7 @@ |
||
6 | 6 | data-id="{{ $r->id }}" |
7 | 7 | <?php |
8 | 8 | foreach ($fields as $f) { |
9 | - echo "data-{$f}=\"" . $r->$f . "\" "; |
|
9 | + echo "data-{$f}=\"".$r->$f."\" "; |
|
10 | 10 | } |
11 | 11 | ?> |
12 | 12 | data-target="#delete{{$trimmed_item}}Modal">Delete</button> |
13 | 13 | \ No newline at end of file |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | $fqModel = $crudApi->getModel(); |
29 | 29 | |
30 | - $this->assertEquals($namespace . 'User', $fqModel); |
|
30 | + $this->assertEquals($namespace.'User', $fqModel); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function testUserGetModelCanBeInstantiated() |
@@ -6,7 +6,7 @@ |
||
6 | 6 | data-id="{{ $r->id }}" |
7 | 7 | <?php |
8 | 8 | foreach ($fields as $f) { |
9 | - echo "data-{$f}=\"" . $r->$f . "\" "; |
|
9 | + echo "data-{$f}=\"".$r->$f."\" "; |
|
10 | 10 | } |
11 | 11 | ?> |
12 | 12 | data-target="#delete{{$trimmed_item}}Modal">Delete</button> |
13 | 13 | \ No newline at end of file |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | private function modalUrl($type) |
128 | 128 | { |
129 | 129 | switch ($type) { |
130 | - case 'edit': |
|
131 | - $action = 'update'; |
|
132 | - break; |
|
133 | - default: |
|
134 | - $action = $type; |
|
135 | - break; |
|
130 | + case 'edit': |
|
131 | + $action = 'update'; |
|
132 | + break; |
|
133 | + default: |
|
134 | + $action = $type; |
|
135 | + break; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | return route('crudapi.'.$action.'.item', $this->model); |
@@ -154,69 +154,69 @@ discard block |
||
154 | 154 | $output = ''; |
155 | 155 | |
156 | 156 | switch ($type) { |
157 | - case 'form-create': |
|
158 | - $output .= $this->fieldHelper->formCreate($fields); |
|
159 | - break; |
|
160 | - case 'form-edit': |
|
161 | - foreach ($fields as $f) { |
|
162 | - $ucF = ucfirst($f); |
|
157 | + case 'form-create': |
|
158 | + $output .= $this->fieldHelper->formCreate($fields); |
|
159 | + break; |
|
160 | + case 'form-edit': |
|
161 | + foreach ($fields as $f) { |
|
162 | + $ucF = ucfirst($f); |
|
163 | 163 | |
164 | - $input_attr = [ |
|
165 | - 'class' => 'form-control', |
|
166 | - 'id' => 'editItem'.$ucF, |
|
167 | - 'name' => $f, |
|
168 | - ]; |
|
164 | + $input_attr = [ |
|
165 | + 'class' => 'form-control', |
|
166 | + 'id' => 'editItem'.$ucF, |
|
167 | + 'name' => $f, |
|
168 | + ]; |
|
169 | 169 | |
170 | - $output .= '<fieldset class="form-group">'; |
|
170 | + $output .= '<fieldset class="form-group">'; |
|
171 | 171 | |
172 | - $output .= '<label for="'.$input_attr['id'].'">'.$ucF.'</label>'; |
|
172 | + $output .= '<label for="'.$input_attr['id'].'">'.$ucF.'</label>'; |
|
173 | 173 | |
174 | - if ($this->fieldHelper->isIdField($f)) { |
|
175 | - $input_attr['type'] = 'select'; |
|
174 | + if ($this->fieldHelper->isIdField($f)) { |
|
175 | + $input_attr['type'] = 'select'; |
|
176 | 176 | |
177 | - $output .= '<select '; |
|
178 | - foreach ($input_attr as $attr => $value) { |
|
179 | - $output .= "{$attr}='{$value}'"; |
|
180 | - } |
|
177 | + $output .= '<select '; |
|
178 | + foreach ($input_attr as $attr => $value) { |
|
179 | + $output .= "{$attr}='{$value}'"; |
|
180 | + } |
|
181 | 181 | |
182 | - $relation = $this->getRelatedModel($f); |
|
183 | - $output .= '>'; |
|
182 | + $relation = $this->getRelatedModel($f); |
|
183 | + $output .= '>'; |
|
184 | 184 | |
185 | - $output .= $this->getRelatedOptions($relation); |
|
186 | - $output .= '</select>'; |
|
187 | - } else { |
|
188 | - $input_attr['type'] = 'text'; |
|
185 | + $output .= $this->getRelatedOptions($relation); |
|
186 | + $output .= '</select>'; |
|
187 | + } else { |
|
188 | + $input_attr['type'] = 'text'; |
|
189 | 189 | |
190 | - $output .= '<input '; |
|
191 | - foreach ($input_attr as $attr => $value) { |
|
192 | - $output .= "{$attr}='{$value}'"; |
|
190 | + $output .= '<input '; |
|
191 | + foreach ($input_attr as $attr => $value) { |
|
192 | + $output .= "{$attr}='{$value}'"; |
|
193 | + } |
|
194 | + $output .= '>'; |
|
193 | 195 | } |
194 | - $output .= '>'; |
|
195 | - } |
|
196 | 196 | |
197 | - $output .= '</fieldset>'; |
|
198 | - } |
|
199 | - break; |
|
200 | - case 'table-headings': |
|
201 | - $output .= $this->fieldHelper->tableHeadings($fields); |
|
202 | - break; |
|
203 | - case 'table-content': |
|
204 | - $output .= $this->fieldHelper->tableContent($fields, $this->instance); |
|
205 | - break; |
|
206 | - // JavaScript Variables |
|
207 | - case 'js-var': |
|
208 | - foreach ($fields as $f) { |
|
209 | - $output .= 'var '.$f.' = '.$this->instance->$f.'; '; |
|
210 | - } |
|
211 | - break; |
|
212 | - case 'js-modal-create': |
|
213 | - foreach ($fields as $f) { |
|
214 | - $output .= '"'.$f.'": $(\'#createItem'.$f.'\').val(), '; |
|
215 | - } |
|
216 | - break; |
|
217 | - default: |
|
218 | - return; |
|
197 | + $output .= '</fieldset>'; |
|
198 | + } |
|
199 | + break; |
|
200 | + case 'table-headings': |
|
201 | + $output .= $this->fieldHelper->tableHeadings($fields); |
|
219 | 202 | break; |
203 | + case 'table-content': |
|
204 | + $output .= $this->fieldHelper->tableContent($fields, $this->instance); |
|
205 | + break; |
|
206 | + // JavaScript Variables |
|
207 | + case 'js-var': |
|
208 | + foreach ($fields as $f) { |
|
209 | + $output .= 'var '.$f.' = '.$this->instance->$f.'; '; |
|
210 | + } |
|
211 | + break; |
|
212 | + case 'js-modal-create': |
|
213 | + foreach ($fields as $f) { |
|
214 | + $output .= '"'.$f.'": $(\'#createItem'.$f.'\').val(), '; |
|
215 | + } |
|
216 | + break; |
|
217 | + default: |
|
218 | + return; |
|
219 | + break; |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | echo $output; |
@@ -277,17 +277,17 @@ discard block |
||
277 | 277 | $class = get_class($field); |
278 | 278 | |
279 | 279 | switch ($class) { |
280 | - case 'App\\Helpers\\CrudApi': |
|
281 | - break; |
|
282 | - case 'App\\Indicator': |
|
283 | - return $field->indicator; |
|
284 | - break; |
|
285 | - case 'Taskforcedev\\CrudApi\\Helpers\\CrudApi': |
|
286 | - return false; |
|
287 | - break; |
|
288 | - default: |
|
289 | - return $field->name; |
|
280 | + case 'App\\Helpers\\CrudApi': |
|
290 | 281 | break; |
282 | + case 'App\\Indicator': |
|
283 | + return $field->indicator; |
|
284 | + break; |
|
285 | + case 'Taskforcedev\\CrudApi\\Helpers\\CrudApi': |
|
286 | + return false; |
|
287 | + break; |
|
288 | + default: |
|
289 | + return $field->name; |
|
290 | + break; |
|
291 | 291 | } |
292 | 292 | } |
293 | 293 |
@@ -32,6 +32,9 @@ |
||
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; |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | $item = new Post(); |
22 | 22 | |
23 | - $config = require __DIR__ . '/../../config/crudapi.php'; |
|
23 | + $config = require __DIR__.'/../../config/crudapi.php'; |
|
24 | 24 | |
25 | 25 | $primary_field = $fieldHelper->getPrimaryField($item, $config); |
26 | 26 |