Merge pull request #32 from NikxDa/master

Update visuals & make autocompleter optional
silvershop · Jun 26, 2019 · fa26ac8 · fa26ac8
2 parents 09444d3 + dd5d4a7
commit fa26ac8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/GridFieldHasOneUnlinkButton.php b/src/GridFieldHasOneUnlinkButton.php
@@ -140,7 +140,7 @@ public function getHTMLFragments($gridField)
         );
 
         $field->setAttribute('data-icon', 'chain--plus')
-            ->addExtraClass('btn btn-outline-secondary font-icon-link-broken action_gridfield_unlinkrelation');
+            ->addExtraClass('align-items-center d-flex btn btn-outline-secondary font-icon-link-broken action_gridfield_unlinkrelation');
 
         return [
             $this->targetFragment => $field->Field(),

diff --git a/src/HasOneButtonField.php b/src/HasOneButtonField.php
@@ -43,8 +43,10 @@ class HasOneButtonField extends GridField
      * @param string $relationName
      * @param string|null $fieldName
      * @param string|null $title
+     * @param GridFieldConfig|null $customConfig
+     * @param boolean|null $useAutocompleter
      */
-    public function __construct(DataObject $parent, $relationName, $fieldName = null, $title = null, GridFieldConfig $customConfig = null)
+    public function __construct(DataObject $parent, $relationName, $fieldName = null, $title = null, GridFieldConfig $customConfig = null, $useAutocompleter = true)
     {
         $record = $parent->{$relationName}();
         $this->setRecord($record);
@@ -59,17 +61,17 @@ public function __construct(DataObject $parent, $relationName, $fieldName = null
             ->addComponent(new GridFieldSummaryField($relationName))
             ->addComponent(new GridFieldDetailForm())
             ->addComponent(new GridFieldHasOneUnlinkButton($parent, 'buttons-before-right'))
-            ->addComponent(new GridFieldHasOneEditButton('buttons-before-right'))
-            ->addComponent(new HasOneAddExistingAutoCompleter('buttons-before-right'));
+            ->addComponent(new GridFieldHasOneEditButton('buttons-before-right'));
+
+        if ($useAutocompleter) {
+            $config->addComponent(new HasOneAddExistingAutoCompleter('buttons-before-right'));
+        }
 
         $list = HasOneButtonRelationList::create($parent, $this->record, $relationName);
 
         // Limit the existing list so that autocomplete will find results
         $list = $list->filter("ID", $this->record->ID);
 
-        // Get columns to display inline
-        $this->addExtraClass("d-flex align-items-start");
-
         parent::__construct($fieldName ?: $relationName, $title, $list, ($customConfig) ?: $config);
         $this->setModelClass($record->ClassName);
     }

diff --git a/templates/SilverShop/HasOneField/GridFieldHasOneButtonRow.ss b/templates/SilverShop/HasOneField/GridFieldHasOneButtonRow.ss
@@ -1,10 +1,10 @@
-<div class="toolbar--content form-group stacked px-lg-0 field ss-gridfield-buttonrow ss-gridfield-buttonrow-{$TargetFragmentName}">
+<div class="form-group field hasone">
 	<label class="form__field-label">
 		$GridField.Title
 	</label>
 	<div class="form__field-holder form-row">
 		<div class="col">$LeftFragment</div>
-		<div class="col-auto btn-toolbar">
+		<div class="col-auto d-flex pr-0">
 			$RightFragment
 		</div>
 	</div>

diff --git a/templates/SilverShop/HasOneField/HasOneAddExistingAutoCompleter.ss b/templates/SilverShop/HasOneField/HasOneAddExistingAutoCompleter.ss
@@ -1,5 +1,5 @@
-<span class="add-existing-autocompleter">
+<span class="add-existing-autocompleter ml-2 d-flex">
 	<% loop $Fields %>
-	<span>$Field</span>
+		<span class="d-flex">$Field</span>
 	<% end_loop %>
 </span>
diff --git a/templates/SilverStripe/Forms/GridField/GridFieldAddNewButton.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewButton.ss
@@ -0,0 +1,3 @@
+<a href="$NewLink" class="mr-0 align-items-center d-flex action action-detail btn btn-primary font-icon-plus-circled new new-link">
+    <span class="btn__title">$ButtonName</span>
+</a>