misc cleanup

src/Elements/ElementBlogPosts.php

@@ -10,12 +10,6 @@
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 
-/*
-if (!class_exists('SilverStripe\\Blog\\Model\\Blog')) {
-    return;
-}
-*/
-
 /**
  * Class RecentBlogPostsBlock
  */
@@ -100,22 +94,4 @@ public function getCMSFields()
 
         return $fields;
     }
-
-    /**
-     * @param null $member
-     * @return bool
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return parent::canCreate();
-    }
-
-    /**
-     * @param null $member
-     * @return bool
-     */
-    public function canView($member = null, $context = [])
-    {
-        return parent::canView();
-    }
 }

src/Elements/ElementFeatures.php

@@ -61,11 +61,11 @@ public function getCMSFields()
         if ($this->ID) {
             // Features
             $config = GridFieldConfig_RecordEditor::create();
-            $config->addComponent(new GridFieldOrderableRows('Sort'));
+            $config->addComponent(new GridFieldOrderableRows('SortOrder'));
             $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
             $config->removeComponentsByType('GridFieldDeleteAction');
             $config->addComponent(new GridFieldDeleteAction(false));
-            $sectionsField = GridField::create('Features', 'Features', $this->Features()->sort('Sort'), $config);
+            $sectionsField = GridField::create('Features', 'Features', $this->Features(), $config);
             $fields->addFieldsToTab('Root.Features', array(
                 $sectionsField,
             ));
@@ -77,9 +77,9 @@ public function getCMSFields()
     /**
      * @return mixed
      */
-    public function getFeatures()
+    public function getFeaturesList()
     {
-        return $this->Features()->sort('Sort');
+        return $this->Features()->sort('SortOrder');
     }
 
     /**

src/Elements/ElementPromos.php

@@ -70,17 +70,12 @@ public function getCMSFields()
     {
         $fields = parent::getCMSFields();
 
-        $fields->removeByName(array(
-            'Promos',
-        ));
-
         if ($this->ID) {
-            $config = GridFieldConfig_RelationEditor::create();
+            $promoField = $fields->dataFieldByName('Promos');
+            $config = $promoField->getConfig();
             $config->addComponent(new GridFieldOrderableRows('SortOrder'));
             $config->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
             $config->addComponent(new GridFieldAddExistingSearchButton());
-            $promos = $this->Promos();
-            $promoField = GridField::create('Promos', 'Promos', $promos, $config);
 
             $fields->addFieldsToTab('Root.Main', array(
                 $promoField,
@@ -95,7 +90,7 @@ public function getCMSFields()
      */
     public function getPromoList()
     {
-        return $this->Promos()->sort('Sort');
+        return $this->Promos()->sort('SortOrder');
     }
 
     /**

src/Model/FeatureObject.php

@@ -15,7 +15,7 @@
  * @property string $Name
  * @property string $Title
  * @property DBHTMLText $Content
- * @property int $Sort
+ * @property int $SortOrder
  * @property int $ImageID
  * @property int $ElementFeaturesID
  */
@@ -38,7 +38,7 @@ class FeatureObject extends DataObject
         'Name' => 'Varchar(255)',
         'Title' => 'Varchar(255)',
         'Content' => 'HTMLText',
-        'Sort' => 'Int',
+        'SortOrder' => 'Int',
     );
 
     /**
@@ -97,7 +97,7 @@ public function getCMSFields()
 
         $fields->removeByName(array(
             'ElementFeaturesID',
-            'Sort',
+            'SortOrder',
         ));
 
         $fields->dataFieldByName('Name')->setDescription('For internal reference only');

templates/Dynamic/Elements/Elements/ElementBlogPosts.ss

@@ -1,5 +1,5 @@
 <div class="$CSSClasses">
-	<% if $BlogID %>
+	<% if $Blog.BlogPosts %>
 		<% loop $Blog.BlogPosts.Limit($Limit) %>
 			<p><a href="$Link.ATT">$Title</a></p>
 		<% end_loop %>

templates/Dynamic/Elements/Elements/ElementFeatures.ss

@@ -1,6 +1,16 @@
-<div class="element_content__content <% if $Style %>element_content__$CssStyle<% end_if %>">
-	<% if $Headline %><h2 class="homeheadline">$Headline</h2><% end_if %>
-	<% if $Image %><img src="$Image.SetWidth(400).URL" class="img-responsive pull-right"><% end_if %>
-	$Content
-    <div class="clearfix"></div>
-</div>
+<div class="$CSSClasses">
+	<% if $FeaturesList %>
+        <div class="row">
+			<% loop $FeaturesList %>
+                <div class="col-md-4">
+					<% if $Title %><div class='block_title'><h3>$Title</h3></div><% end_if %>
+					<% if $Image %><img src="$Image.URL" class="img-responsive" alt="$Title.ATT"><% end_if %>
+					<% if $Content %><div class='block_content'>$Content</div><% end_if %>
+					<% if $LinkType != None %><a href="<% if $LinkType == 'External'%>$ExternalLink<% else_if $LinkType == 'Internal'%>$PageLink.Link<% end_if %>"<% if $LinkType == 'External' %> target="_blank"<% end_if %> title="$PageLink.MenuTitle.XML"><% end_if %>
+					$LinkLabel
+					<% if $LinkType != None %></a><% end_if %>
+                </div>
+			<% end_loop %>
+        </div>
+	<% end_if %>
+</div>

tests/ElementFeaturesTest.php

@@ -5,6 +5,7 @@
 use Dynamic\Elements\Elements\ElementFeatures;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataList;
 
 class ElementFeaturesTest extends SapphireTest
 {
@@ -22,4 +23,11 @@ public function testGetCMSFields()
         $fields = $object->getCMSFields();
         $this->assertInstanceOf(FieldList::class, $fields);
     }
+
+    public function testGetFeaturesList()
+    {
+        $object = $this->objFromFixture(ElementFeatures::class, 'one');
+        $this->assertInstanceOf(DataList::class, $object->getFeaturesList());
+        $this->assertEquals($object->getFeaturesList(), $object->Features()->sort('SortOrder'));
+    }
 }

tests/ElementPromosTest.php

@@ -35,6 +35,6 @@ public function testGetPromoList()
     {
         $object = $this->objFromFixture(ElementPromos::class, 'one');
         $this->assertInstanceOf(DataList::class, $object->getPromoList());
-        $this->assertEquals($object->getPromoList(), $object->Promos()->sort('Sort'));
+        $this->assertEquals($object->getPromoList(), $object->Promos()->sort('SortOrder'));
     }
 }

tests/fixtures.yml

@@ -26,9 +26,6 @@ SilverStripe\Security\Member:
     Surname: "Member"
     Email: "user"
     Password: "user"
-Dynamic\Elements\Elements\DynamicBaseElement:
-  default:
-    Title: "Base Element"
 Dynamic\Elements\Model\AccordionPanel:
   one:
     Name: "Panel One"