Merge pull request #5 from thewebmen/small-fixes

Small fixes
wedevelopnl · Nov 19, 2020 · d1bf2d3 · d1bf2d3
2 parents 4a7af8d + 9cb3c57
commit d1bf2d3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/src/Admin/MenusAdmin.php b/src/Admin/MenusAdmin.php
@@ -15,6 +15,8 @@ class MenusAdmin extends ModelAdmin {
 
     private static $menu_title = 'Menus';
 
+    private static $menu_icon_class = 'font-icon-menu';
+
     public function getEditForm($id = null, $fields = null){
         $form = parent::getEditForm($id, $fields);
 

diff --git a/src/Model/MenuItem.php b/src/Model/MenuItem.php
@@ -2,6 +2,7 @@
 
 namespace TheWebmen\Menustructure\Model;
 
+use SilverStripe\Assets\File;
 use SilverStripe\Assets\Image;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\Controller;
@@ -19,6 +20,7 @@ class MenuItem extends DataObject {
     private static $link_types = [
         'page' => 'Page',
         'url' => 'URL',
+        'file' => 'File',
         'no-link' => 'Not linked'
     ];
 
@@ -34,6 +36,7 @@ class MenuItem extends DataObject {
 
     private static $has_one = [
         'Image' => Image::class,
+        'File' => File::class,
         'Menu' => Menu::class,
         'ParentItem' => MenuItem::class,
         'LinkedPage' => SiteTree::class
@@ -43,6 +46,11 @@ class MenuItem extends DataObject {
         'Items' => MenuItem::class
     ];
 
+    private static $owns = [
+      'Image',
+      'File'
+    ];
+
     private static $summary_fields = [
         'Title',
         'LinkType',
@@ -61,12 +69,13 @@ public function getCMSFields()
             $fields->removeByName('ParentItemID');
             $fields->removeByName('MenuID');
 
-            $fields->replaceField('LinkType', DropdownField::create('LinkType', $this->fieldLabel('LinkType'), self::$link_types));
+            $fields->replaceField('LinkType', DropdownField::create('LinkType', $this->fieldLabel('LinkType'), $this->getLinkTypes()));
             $fields->replaceField('LinkedPageID', $linkedPageWrapper = Wrapper::create(TreeDropdownField::create('LinkedPageID', $this->fieldLabel('LinkedPage'), SiteTree::class)));
 
             $linkedPageWrapper->displayIf('LinkType')->isEqualTo('page');
+            $fields->dataFieldByName('File')->displayIf('LinkType')->isEqualTo('file');
             $fields->dataFieldByName('Url')->displayIf('LinkType')->isEqualTo('url');
-            $fields->dataFieldByName('OpenInNewWindow')->hideIf('LinkType')->isEqualTo('no-link');
+            $fields->dataFieldByName('OpenInNewWindow')->displayIf('LinkType')->isEqualTo('page')->orIf('LinkType')->isEqualTo('url')->orIf('LinkType')->isEqualTo('file');
 
             $fields->addFieldToTab('Root.Main', $fields->dataFieldByName('OpenInNewWindow'));
             $fields->addFieldToTab('Root.Main', $fields->dataFieldByName('Image')->setFolderName('Menus')->setDescription('Optional image, can be used in some templates.'));
@@ -82,6 +91,12 @@ public function getCMSFields()
         return parent::getCMSFields();
     }
 
+    private function getLinkTypes() {
+        $linkTypes = self::$link_types;
+        $this->extend('updateLinkTypes', $linkTypes);
+        return $linkTypes;
+    }
+
     /**
      * @return bool|mixed
      */
@@ -93,6 +108,9 @@ public function getLink(){
             case 'page':
                 return $this->LinkedPage()->Link();
                 break;
+            case 'file':
+                return $this->File()->Link();
+                break;
         }
         return false;
     }
@@ -160,17 +178,6 @@ public function canDelete($member = null)
         return parent::canDelete($member);
     }
 
-    protected function onAfterWrite()
-    {
-        parent::onAfterWrite();
-
-        $image = $this->Image();
-
-        if ($image && $image->exists() && !$image->isPublished()) {
-            $image->doPublish();
-        }
-    }
-
     /**
      * Recursive delete
      */