@@ -279,7 +279,7 @@ |
||
279 | 279 | /** |
280 | 280 | * Helper function to return commands to return in AjaxResponse. |
281 | 281 | * |
282 | - * @return array |
|
282 | + * @return SelectEntitiesCommand[] |
|
283 | 283 | * An array of ajax commands. |
284 | 284 | */ |
285 | 285 | public function getAjaxCommands(FormStateInterface $form_state) { |
@@ -12,7 +12,6 @@ discard block |
||
12 | 12 | use Drupal\Core\Entity\EntityInterface; |
13 | 13 | use Drupal\Core\Routing\RouteMatchInterface; |
14 | 14 | use Drupal\Core\Url; |
15 | -use Drupal\entity_browser\DisplayAjaxInterface; |
|
16 | 15 | use Drupal\entity_browser\DisplayBase; |
17 | 16 | use Drupal\entity_browser\DisplayRouterInterface; |
18 | 17 | use Drupal\entity_browser\Events\Events; |
@@ -21,7 +20,6 @@ discard block |
||
21 | 20 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
22 | 21 | use Drupal\Core\Path\CurrentPathStack; |
23 | 22 | use Drupal\Core\Ajax\AjaxResponse; |
24 | -use Drupal\Core\Ajax\CloseDialogCommand; |
|
25 | 23 | use Drupal\entity_browser\Ajax\SelectEntitiesCommand; |
26 | 24 | use Symfony\Component\HttpKernel\Event\FilterResponseEvent; |
27 | 25 | use Symfony\Component\HttpKernel\KernelEvents; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | */ |
71 | 71 | protected $uuid = NULL; |
72 | 72 | |
73 | - /** |
|
73 | + /** |
|
74 | 74 | * Current request. |
75 | 75 | * |
76 | 76 | * @var \Symfony\Component\HttpFoundation\Request |
@@ -343,8 +343,8 @@ discard block |
||
343 | 343 | } |
344 | 344 | |
345 | 345 | /** |
346 | - * {@inheritdoc} |
|
347 | - */ |
|
346 | + * {@inheritdoc} |
|
347 | + */ |
|
348 | 348 | public function setUuid($uuid) { |
349 | 349 | $this->uuid = $uuid; |
350 | 350 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | // info. |
141 | 141 | $js_event_object = new RegisterJSCallbacks($this->configuration['entity_browser_id'], $uuid); |
142 | 142 | $js_event_object->registerCallback('Drupal.entityBrowser.selectionCompleted'); |
143 | - $js_event = $this->eventDispatcher->dispatch(Events::REGISTER_JS_CALLBACKS, $js_event_object ); |
|
143 | + $js_event = $this->eventDispatcher->dispatch(Events::REGISTER_JS_CALLBACKS, $js_event_object); |
|
144 | 144 | $original_path = $this->currentPath->getPath(); |
145 | 145 | $data = [ |
146 | 146 | 'query_parameters' => [ |
@@ -160,21 +160,21 @@ discard block |
||
160 | 160 | '#theme_wrappers' => ['container'], |
161 | 161 | 'path' => [ |
162 | 162 | '#type' => 'hidden', |
163 | - '#value' => Url::fromRoute('entity_browser.' . $this->configuration['entity_browser_id'], [], $data['query_parameters'])->toString(), |
|
163 | + '#value' => Url::fromRoute('entity_browser.'.$this->configuration['entity_browser_id'], [], $data['query_parameters'])->toString(), |
|
164 | 164 | ], |
165 | 165 | 'open_modal' => [ |
166 | 166 | '#type' => 'submit', |
167 | 167 | '#value' => $this->configuration['link_text'], |
168 | 168 | '#limit_validation_errors' => [], |
169 | 169 | '#submit' => [], |
170 | - '#name' => Html::getId('op_' . $this->configuration['entity_browser_id'] . '_' . $uuid), |
|
170 | + '#name' => Html::getId('op_'.$this->configuration['entity_browser_id'].'_'.$uuid), |
|
171 | 171 | '#ajax' => [ |
172 | 172 | 'callback' => [$this, 'openModal'], |
173 | 173 | 'event' => 'click', |
174 | 174 | ], |
175 | 175 | '#attributes' => $data['attributes'], |
176 | 176 | '#attached' => [ |
177 | - 'library' => ['core/drupal.dialog.ajax', 'entity_browser/modal'], |
|
177 | + 'library' => ['core/drupal.dialog.ajax', 'entity_browser/modal'], |
|
178 | 178 | 'drupalSettings' => [ |
179 | 179 | 'entity_browser' => [ |
180 | 180 | 'modal' => [ |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | 'height' => $this->configuration['height'] - 90, |
220 | 220 | 'frameborder' => 0, |
221 | 221 | 'style' => 'padding:', |
222 | - 'name' => Html::cleanCssIdentifier('entity-browser-iframe-' . $this->configuration['entity_browser_id']) |
|
222 | + 'name' => Html::cleanCssIdentifier('entity-browser-iframe-'.$this->configuration['entity_browser_id']) |
|
223 | 223 | ], |
224 | 224 | ]; |
225 | 225 | $html = drupal_render($content); |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | * An array of ajax commands. |
296 | 296 | */ |
297 | 297 | public function getAjaxCommands(FormStateInterface $form_state) { |
298 | - $entities = array_map(function(EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()];}, $form_state->get(['entity_browser', 'selected_entities'])); |
|
298 | + $entities = array_map(function(EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()]; }, $form_state->get(['entity_browser', 'selected_entities'])); |
|
299 | 299 | |
300 | 300 | $commands = array(); |
301 | 301 | $commands[] = new SelectEntitiesCommand($this->uuid, $entities); |
@@ -315,13 +315,13 @@ discard block |
||
315 | 315 | public function propagateSelection(FilterResponseEvent $event) { |
316 | 316 | $render = [ |
317 | 317 | 'labels' => [ |
318 | - '#markup' => 'Labels: ' . implode(', ', array_map(function (EntityInterface $item) {return $item->label();}, $this->entities)), |
|
318 | + '#markup' => 'Labels: '.implode(', ', array_map(function(EntityInterface $item) {return $item->label(); }, $this->entities)), |
|
319 | 319 | '#attached' => [ |
320 | 320 | 'library' => ['entity_browser/modal_selection'], |
321 | 321 | 'drupalSettings' => [ |
322 | 322 | 'entity_browser' => [ |
323 | 323 | 'modal' => [ |
324 | - 'entities' => array_map(function (EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()];}, $this->entities), |
|
324 | + 'entities' => array_map(function(EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()]; }, $this->entities), |
|
325 | 325 | 'uuid' => $this->request->query->get('uuid'), |
326 | 326 | ], |
327 | 327 | ], |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | * {@inheritdoc} |
338 | 338 | */ |
339 | 339 | public function path() { |
340 | - return '/entity-browser/modal/' . $this->configuration['entity_browser_id']; |
|
340 | + return '/entity-browser/modal/'.$this->configuration['entity_browser_id']; |
|
341 | 341 | } |
342 | 342 | |
343 | 343 | /** |
@@ -336,7 +336,7 @@ |
||
336 | 336 | '_title_callback' => 'Drupal\entity_browser\Controllers\StandalonePage::title', |
337 | 337 | 'entity_browser_id' => $this->id(), |
338 | 338 | ], |
339 | - ['_permission' => 'access ' . $this->id() . ' entity browser pages'], |
|
339 | + ['_permission' => 'access '.$this->id().' entity browser pages'], |
|
340 | 340 | ['_admin_route' => \Drupal::config('node.settings')->get('use_admin_theme')] |
341 | 341 | ); |
342 | 342 | } |
@@ -116,8 +116,7 @@ |
||
116 | 116 | |
117 | 117 | if (!$this->isSelectionCompleted($form_state)) { |
118 | 118 | $form_state->setRebuild(); |
119 | - } |
|
120 | - else { |
|
119 | + } else { |
|
121 | 120 | $entity_browser->getDisplay()->selectionCompleted($this->getSelectedEntities($form_state)); |
122 | 121 | } |
123 | 122 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | * {@inheritdoc} |
32 | 32 | */ |
33 | 33 | public function getFormId() { |
34 | - return 'entity_browser_' . $this->entity_browser->id() . '_form'; |
|
34 | + return 'entity_browser_'.$this->entity_browser->id().'_form'; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | foreach ($browsers as $browser) { |
65 | 65 | if ($browser->route()) { |
66 | - $permissions['access ' . $browser->id() . ' entity browser pages'] = array( |
|
66 | + $permissions['access '.$browser->id().' entity browser pages'] = array( |
|
67 | 67 | 'title' => $this->translationManager->translate('Access @name pages', array('@name' => $browser->label())), |
68 | 68 | 'description' => $this->translationManager->translate('Access pages that %browser uses to operate.', array('%browser' => $browser->label())), |
69 | 69 | ); |
@@ -51,7 +51,7 @@ |
||
51 | 51 | // them only once. Reason for that is how SQL and Views work and we probably |
52 | 52 | // can't do much about it. |
53 | 53 | if (!empty($this->selectedEntities)) { |
54 | - $ids = array_map(function(EntityInterface $item) {return $item->id();}, $this->selectedEntities); |
|
54 | + $ids = array_map(function(EntityInterface $item) {return $item->id(); }, $this->selectedEntities); |
|
55 | 55 | $storage['selection_display_view']->setArguments([implode(',', $ids)]); |
56 | 56 | } |
57 | 57 |
@@ -53,7 +53,7 @@ |
||
53 | 53 | $uploaded_files = $form_state->getValue(['upload'], []); |
54 | 54 | $trigger = $form_state->getTriggeringElement(); |
55 | 55 | // Only validate if we are uploading a file. |
56 | - if (empty($uploaded_files) && $trigger['#value'] == 'Upload') { |
|
56 | + if (empty($uploaded_files) && $trigger['#value'] == 'Upload') { |
|
57 | 57 | $form_state->setError($form['widget']['upload'], t('At least one file should be uploaded.')); |
58 | 58 | } |
59 | 59 | } |
@@ -72,9 +72,9 @@ |
||
72 | 72 | * @param \Drupal\Core\Session\AccountInterface $current_user |
73 | 73 | * The current user. |
74 | 74 | */ |
75 | - public function __construct(array $configuration, $plugin_id, $plugin_definition, EventDispatcherInterface $event_dispatcher, EntityManagerInterface $entity_manager, AccountInterface $current_user) { |
|
76 | - parent::__construct($configuration, $plugin_id, $plugin_definition, $event_dispatcher, $entity_manager); |
|
77 | - $this->currentUser = $current_user; |
|
75 | + public function __construct(array $configuration, $plugin_id, $plugin_definition, EventDispatcherInterface $event_dispatcher, EntityManagerInterface $entity_manager, AccountInterface $current_user) { |
|
76 | + parent::__construct($configuration, $plugin_id, $plugin_definition, $event_dispatcher, $entity_manager); |
|
77 | + $this->currentUser = $current_user; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -124,8 +124,7 @@ discard block |
||
124 | 124 | return [ |
125 | 125 | '#markup' => t('Entity browser select form field not found on a view. <a href=":link">Go fix it</a>!', [':link' => $url]), |
126 | 126 | ]; |
127 | - } |
|
128 | - else { |
|
127 | + } else { |
|
129 | 128 | return [ |
130 | 129 | '#markup' => t('Entity browser select form field not found on a view. Go fix it!'), |
131 | 130 | ]; |
@@ -183,8 +182,7 @@ discard block |
||
183 | 182 | ]); |
184 | 183 | $form_state->setError($form['widget']['view']['entity_browser_select'], $message); |
185 | 184 | } |
186 | - } |
|
187 | - catch (PluginNotFoundException $e) { |
|
185 | + } catch (PluginNotFoundException $e) { |
|
188 | 186 | $message = t('The Entity Type @type does not exist.', [ |
189 | 187 | '@type' => $parts[0], |
190 | 188 | ]); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | $form['view'] = $view->executeDisplay($this->configuration['view_display']); |
117 | 117 | |
118 | 118 | if (empty($view->field['entity_browser_select'])) { |
119 | - $url = Url::fromRoute('entity.view.edit_form',['view'=>$this->configuration['view']])->toString(); |
|
119 | + $url = Url::fromRoute('entity.view.edit_form', ['view'=>$this->configuration['view']])->toString(); |
|
120 | 120 | if ($this->currentUser->hasPermission('administer views')) { |
121 | 121 | return [ |
122 | 122 | '#markup' => t('Entity browser select form field not found on a view. <a href=":link">Go fix it</a>!', [':link' => $url]), |
@@ -220,13 +220,13 @@ discard block |
||
220 | 220 | foreach ($displays as $display) { |
221 | 221 | list($view_id, $display_id) = $display; |
222 | 222 | $view = $this->entityManager->getStorage('view')->load($view_id); |
223 | - $options[$view_id . '.' . $display_id] = $this->t('@view : @display', array('@view' => $view->label(), '@display' => $view->get('display')[$display_id]['display_title'])); |
|
223 | + $options[$view_id.'.'.$display_id] = $this->t('@view : @display', array('@view' => $view->label(), '@display' => $view->get('display')[$display_id]['display_title'])); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | $form['view'] = [ |
227 | 227 | '#type' => 'select', |
228 | 228 | '#title' => $this->t('View : View display'), |
229 | - '#default_value' => $this->configuration['view'] . '.' . $this->configuration['view_display'], |
|
229 | + '#default_value' => $this->configuration['view'].'.'.$this->configuration['view_display'], |
|
230 | 230 | '#options' => $options, |
231 | 231 | ]; |
232 | 232 |
@@ -24,7 +24,7 @@ |
||
24 | 24 | /** |
25 | 25 | * {@inheritdoc} |
26 | 26 | */ |
27 | - public function getForm(array &$form = array(), FormStateInterface &$form_state = NULL) { |
|
27 | + public function getForm(array &$form = array(), FormStateInterface&$form_state = NULL) { |
|
28 | 28 | // Set a wrapper container for us to replace the form on ajax call. |
29 | 29 | $form['#prefix'] = '<div id="entity-browser-form">'; |
30 | 30 | $form['#suffix'] = '</div>'; |
@@ -24,7 +24,7 @@ |
||
24 | 24 | /** |
25 | 25 | * {@inheritdoc} |
26 | 26 | */ |
27 | - public function getForm(array &$form, FormStateInterface &$form_state) { |
|
27 | + public function getForm(array &$form, FormStateInterface&$form_state) { |
|
28 | 28 | return array(); |
29 | 29 | } |
30 | 30 |