Merge commit '2f0c4209'

* commit '2f0c4209':
  Squashed 'Modules/Menu/' changes from c345f10..cd29d47

Modules/Menu/Http/Controllers/Admin/MenuItemController.php

@@ -8,6 +8,7 @@ use Modules\Menu\Entities\Menuitem;
 use Modules\Menu\Http\Requests\CreateMenuItemRequest;
 use Modules\Menu\Http\Requests\UpdateMenuItemRequest;
 use Modules\Menu\Repositories\MenuItemRepository;
+use Modules\Page\Repositories\PageRepository;
 
 class MenuItemController
 {
@@ -19,16 +20,23 @@ class MenuItemController
      * @var Redirector
      */
     private $redirector;
+    /**
+     * @var PageRepository
+     */
+    private $page;
 
-    public function __construct(MenuItemRepository $menuItem, Redirector $redirector)
+    public function __construct(MenuItemRepository $menuItem, Redirector $redirector, PageRepository $page)
     {
         $this->menuItem = $menuItem;
         $this->redirector = $redirector;
+        $this->page = $page;
     }
 
     public function create(Menu $menu)
     {
-        return view('menu::admin.menuitems.create', compact('menu'));
+        $pages = $this->page->all();
+
+        return view('menu::admin.menuitems.create', compact('menu', 'pages'));
     }
 
     public function store(Menu $menu, CreateMenuItemRequest $request)
@@ -41,7 +49,9 @@ class MenuItemController
 
     public function edit(Menu $menu, Menuitem $menuItem)
     {
-        return view('menu::admin.menuitems.edit', compact('menu', 'menuItem'));
+        $pages = $this->page->all();
+
+        return view('menu::admin.menuitems.edit', compact('menu', 'menuItem', 'pages'));
     }
 
     public function update(Menu $menu, Menuitem $menuItem, UpdateMenuItemRequest $request)

Modules/Menu/Http/Requests/UpdateMenuRequest.php

@@ -6,9 +6,10 @@ class UpdateMenuRequest extends FormRequest
 {
     public function rules()
     {
+        $menu = $this->route()->getParameter('menus');
         return [
             'name' => 'required',
-            'primary' => 'unique:menus',
+            'primary' => "unique:menus,primary,{$menu->id}",
         ];
     }
 

Modules/Menu/Repositories/Eloquent/EloquentMenuItemRepository.php

@@ -50,7 +50,7 @@ class EloquentMenuItemRepository extends EloquentBaseRepository implements MenuI
 
         $menuitemsArray = [];
         foreach ($menuitems as $menuitem) {
-            $menuitemsArray[$menuitem->module_name][$menuitem->locale] = $menuitem->locale . '/' . $menuitem->uri;
+            $menuitemsArray[$menuitem->module_name][$menuitem->locale] = $menuitem->uri;
         }
 
         return $menuitemsArray;

Modules/Menu/Resources/views/admin/menuitems/partials/create-fields.blade.php

@@ -2,6 +2,9 @@
     <label for="page">{{ trans('menu::menu-items.form.page') }}</label>
     <select class="form-control" name="page_id" id="page">
         <option value=""></option>
+        <?php foreach($pages as $page): ?>
+            <option value="{{ $page->id }}">{{ $page->title }}</option>
+        <?php endforeach; ?>
     </select>
 </div>
 

Modules/Menu/Resources/views/admin/menuitems/partials/edit-fields.blade.php

@@ -2,6 +2,11 @@
     <label for="page">{{ trans('menu::menu-items.form.page') }}</label>
     <select class="form-control" name="page_id" id="page">
         <option value=""></option>
+        <?php foreach($pages as $page): ?>
+            <option value="{{ $page->id }}" {{ $menuItem->page_id == $page->id ? 'selected' : '' }}>
+                {{ $page->title }}
+            </option>
+        <?php endforeach; ?>
     </select>
 </div>
 

Modules/Menu/Resources/views/admin/menus/partials/create-fields.blade.php

@@ -3,7 +3,7 @@
     {!! Form::text('name', Input::old('name'), ['class' => 'form-control', 'placeholder' => trans('menu::menu.form.name')]) !!}
     {!! $errors->first('Name', '<span class="help-block">:message</span>') !!}
 </div>
-<div class="checkbox">
+<div class="checkbox {{ $errors->has('primary') ? ' has-error' : '' }}">
     <label for="primary">
         <input id="primary"
                 name="primary"
@@ -11,5 +11,6 @@
                 class="flat-blue"
                 value="1" />
         {{ trans('menu::menu.form.primary') }}
+        {!! $errors->first('primary', '<span class="help-block">:message</span>') !!}
     </label>
 </div>

Modules/Menu/composer.json

+{
+  "name": "asgardcms/menu-module",
+  "type": "asgard-module",
+  "description": "Menu module for AsgardCMS. Handles all the menus.",
+  "keywords": [
+    "asgardcms",
+    "menu",
+    "tree",
+    "nested sets"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Nicolas Widart",
+      "email": "info@asgardcms.com",
+      "role": "Developer"
+    }
+  ],
+  "support": {
+    "email": "support@asgardcms.com",
+    "issues": "https://github.com/AsgardCms/Menu/issues",
+    "source": "https://github.com/AsgardCms/Menu"
+  },
+  "require": {
+    "php": ">=5.4",
+    "composer/installers": "~1.0"
+  },
+  "minimum-stability": "dev"
+}

Modules/Menu/module.json

@@ -5,6 +5,7 @@
   "keywords": [
   ],
   "active": 1,
+  "priority": 2,
   "providers": [
     "Modules\\Menu\\Providers\\RouteServiceProvider",
     "Modules\\Menu\\Providers\\MenuServiceProvider"