Merge pull request #5 from nswdpc/general-code-updates

Updates and improvements

README.md

@@ -29,7 +29,6 @@ The object of this module is to:
 + allow editing and creation of links within the context of the parent record
 + ~~have no Javascript dependencies, beyond those provided by core framework fields~~ (we tried)
 + act as a drop-in replacement for the LinkField provided by [gorriecoe/silverstripe-linkfield](https://github.com/gorriecoe/silverstripe-linkfield) (NB: **for has-one relations only**)
-+ **automatically publish** linked `File` and/or `SiteTree` relations when the parent record is published, via the Silverstripe ownership API
 
 
 ### Elemental inline editing

src/Forms/InlineLinkField.php

@@ -16,6 +16,7 @@
 use SilverStripe\Forms\OptionsetField;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\Tip;
+use SilverStripe\Forms\SelectionGroup;
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
@@ -30,12 +31,12 @@ class InlineLinkField extends CompositeField
 {
 
     /**
-     * @var gorriecoe\Link\Models\Link|null
+     * @var \gorriecoe\Link\Models\Link|null
      */
     protected $record;
 
     /**
-     * @var SilverStripe\ORM\DataObject|null
+     * @var \SilverStripe\ORM\DataObject|null
      */
     protected $parent;
 
@@ -272,10 +273,12 @@ public function setSubmittedValue($values, $data = null)
                 $field->setSubmittedValue( $value );
             }
         }
+
+        return  $this;
     }
 
     /**
-     * @param InlineLink_TitleField
+     * @param InlineLink_TitleField $field
      */
     public function setTitleField(InlineLink_TitleField $field) {
         $this->title_field = $field;
@@ -290,7 +293,7 @@ public function getTitleField() {
     }
 
     /**
-     * @param InlineLink_OpenInNewWindowField
+     * @param InlineLink_OpenInNewWindowField $field
      */
     public function setOpenInNewWindowField(InlineLink_OpenInNewWindowField $field) {
         $this->open_in_new_window_field = $field;
@@ -305,7 +308,7 @@ public function getOpenInNewWindowField() {
     }
 
     /**
-     * @param InlineLink_RemoveAction
+     * @param InlineLink_RemoveAction $field
      */
     public function setRemoveField(InlineLink_RemoveAction $field) {
         $this->remove_field = $field;
@@ -433,7 +436,6 @@ public function saveInto(DataObjectInterface $record)
     /**
      * Create or save a link using the value from the form field
      * @param string $type eg. 'Email'
-     * @param mixed $value eg. '[email protected]'
      * @param FormField $field the Form field holding the data related to the type
      * @return Link
      */
@@ -585,7 +587,7 @@ public function prefixedFieldName($index) {
      * @return string
      */
     protected function getIndexFromName($complete_field_name) {
-        $type = "";
+        $index = "";
         if($this->hasInlineElementalParent()) {
             // the field name should start with the prefix...
             if(strpos($complete_field_name, $this->getName() . self::FIELD_NAME_TYPE_SEPARATOR) !== 0) {

src/Forms/InlineLink_OpenInNewWindowField.php

@@ -13,6 +13,11 @@ class InlineLink_OpenInNewWindowField extends CheckboxField {
 
     use InlineLink;
 
+    /**
+     * @var string
+     */
+    protected $link_type = '';
+
     /**
      * @inheritdoc
      */

src/Forms/InlineLink_RemoveAction.php

@@ -12,4 +12,9 @@ class InlineLink_RemoveAction extends CheckboxField {
 
     use InlineLink;
 
+    /**
+     * @var string
+     */
+    protected $link_type = '';
+
 }

src/Forms/InlineLink_SiteTreeField.php

@@ -1,6 +1,8 @@
 <?php
 
 namespace NSWDPC\InlineLinker;
+
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\TreeDropdownField;
 
 class InlineLink_SiteTreeField extends TreeDropdownField {

src/Forms/InlineLink_TitleField.php

@@ -7,14 +7,19 @@
 
 class InlineLink_TitleField extends TextField {
 
+    use InlineLink;
+
     /**
      * This is INPUT's type attribute value.
      *
      * @var string
      */
     protected $inputType = 'text';
 
-    use InlineLink;
+    /**
+     * @var string
+     */
+    protected $link_type = '';
 
     public function Type()
     {

src/Forms/InlineLink_TypeDefinedTextField.php

@@ -20,6 +20,11 @@ class InlineLink_TypeDefinedTextField extends TextField {
      */
     protected $inputType = 'text';
 
+    /**
+     * @var string
+     */
+    protected $link_type = '';
+
     public function Type()
     {
         return 'text';