Merge pull request #4 from netcore/master

Error fixes, custom actions <td>
netcore · Dec 16, 2017 · 24bbaa1 · 24bbaa1
2 parents 44380f6 + d5a9f6d
commit 24bbaa1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/Config/config.php b/Config/config.php
@@ -25,7 +25,10 @@
      */
     'datatable' => [
         // Presenter is used to modify datatable column titles and values if necessary.
-        'presenter' => \App\Presenters\AdminUsersDatatablePresenter::class,
+        'presenter'     => \App\Presenters\AdminUsersDatatablePresenter::class,
+
+        // View from which user actions <td> is imported
+        'actions_td'    => 'user::users.tds.actions'
     ],
 
     // Example export options config

diff --git a/Resources/views/users/tds/actions.blade.php b/Resources/views/users/tds/actions.blade.php
@@ -1,4 +1,4 @@
-@if(isset($config['allow-view']) && $config['allow-view'] || !isset($config['allow-view']))
+@if(isset($config['allow-view']) && $config['allow-view'])
     <a href="{{ crud_route('show', $row) }}" class="btn btn-xs btn-default">
         <i class="fa fa-eye"></i>
     </a>
@@ -8,7 +8,7 @@
     <i class="fa fa-pencil"></i>
 </a>
 
-@if(isset($config['allow-delete']) && $config['allow-delete'] || !isset($config['allow-delete']))
+@if(isset($config['allow-delete']) && $config['allow-delete'])
     {!! Form::open(['url' => crud_route('destroy', $row->id), 'style' => 'display: inline-block']) !!}
         {{ method_field('DELETE') }}
         <button type="submit" class="btn btn-xs btn-danger" onclick="return confirm('Are you sure?');">

diff --git a/Traits/AdminUsersPagination.php b/Traits/AdminUsersPagination.php
@@ -31,9 +31,11 @@ public function paginate()
             $this->modifyDatatableColumns($datatable, $presenter);
         }
 
+        $actionsTd = config('netcore.module-user.datatable.actions_td');
+
         // Add action column
-        $datatable->addColumn('action', function ($row) {
-            return view('user::users.tds.actions', compact('row'))->render();
+        $datatable->addColumn('action', function ($row) use ($actionsTd) {
+            return view($actionsTd ?? 'user::users.tds.actions', compact('row'))->render();
         });
 
         // Don't escape action column as it contains HTML code.

diff --git a/Traits/ReplaceableAttributes.php b/Traits/ReplaceableAttributes.php
@@ -16,7 +16,7 @@ public function getReplaceable(): array
 
         foreach ($attributes as $attribute)
         {
-            $replaceable[$prefix . $attribute] = $this[$attribute] ?? null;
+            $replaceable[strtoupper($prefix . $attribute)] = $this[$attribute] ?? null;
         }
 
         return $replaceable;

diff --git a/Traits/UserPermissions.php b/Traits/UserPermissions.php
@@ -10,10 +10,18 @@ trait UserPermissions
 {
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne|object
      */
     public function role()
     {
+        $module = Module::find('Permission');
+
+        if (! $module || !$module->enabled()) {
+            return (object)[
+                'levels' => collect()
+            ];
+        }
+
         return $this->belongsTo(Role::class);
     }