Skip to content

Commit c0299c1

Browse files
sohelaminsohelamin
committed
Form changes & other
1 parent 93f86e6 commit c0299c1

File tree

9 files changed

+34
-46
lines changed

9 files changed

+34
-46
lines changed

‎publish/Model/Setting.php‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
namespace App;
44

55
use Illuminate\Database\Eloquent\Model;
6-
use Spatie\Activitylog\Traits\LogsActivity;
76

87
class Setting extends Model
98
{
10-
use LogsActivity;
11-
9+
/**
10+
* Indicates if the model should be timestamped.
11+
*
12+
* @var bool
13+
*/
14+
public $timestamps = false;
1215

1316
/**
1417
* The database table used by the model.
@@ -18,10 +21,10 @@ class Setting extends Model
1821
protected $table = 'settings';
1922

2023
/**
21-
* The database primary key value.
22-
*
23-
* @var string
24-
*/
24+
* The database primary key value.
25+
*
26+
* @var string
27+
*/
2528
protected $primaryKey = 'id';
2629

2730
/**
@@ -30,18 +33,4 @@ class Setting extends Model
3033
* @var array
3134
*/
3235
protected $fillable = ['key', 'value'];
33-
34-
35-
36-
/**
37-
* Change activity log event description
38-
*
39-
* @param string $eventName
40-
*
41-
* @return string
42-
*/
43-
public function getDescriptionForEvent($eventName)
44-
{
45-
return __CLASS__ . " model has been {$eventName}";
46-
}
4736
}

‎publish/resources/crud-generator/views/html/index.blade.stub‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
<td>{{ $loop->iteration or $item->%%primaryKey%% }}</td>
4040
%%formBodyHtml%%
4141
<td>
42-
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%%) }}" title="View %%modelName%%"><button class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
43-
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%% . '/edit') }}" title="Edit %%modelName%%"><button class="btn btn-primary btn-xs"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
42+
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%%) }}" title="View %%modelName%%"><button class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
43+
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%% . '/edit') }}" title="Edit %%modelName%%"><button class="btn btn-primary btn-xs"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>
4444

4545
<form method="POST" action="{{ url('/%%routeGroup%%%%viewName%%' . '/' . $item->%%primaryKey%%) }}" accept-charset="UTF-8" style="display:inline">
4646
{{ method_field('DELETE') }}
4747
{{ csrf_field() }}
48-
<button type="submit" class="btn btn-danger btn-xs" title="Delete %%modelName%%" onclick="return confirm(&quot;Confirm delete?&quot;)"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</button>
48+
<button type="submit" class="btn btn-danger btn-xs" title="Delete %%modelName%%" onclick="return confirm(&quot;Confirm delete?&quot;)"><i class="fa fa-trash-o" aria-hidden="true"></i></button>
4949
</form>
5050
</td>
5151
</tr>

‎publish/resources/crud-generator/views/laravelcollective/index.blade.stub‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
<td>{{ $loop->iteration or $item->%%primaryKey%% }}</td>
4040
%%formBodyHtml%%
4141
<td>
42-
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%%) }}" title="View %%modelName%%"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
43-
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%% . '/edit') }}" title="Edit %%modelName%%"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
42+
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%%) }}" title="View %%modelName%%"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
43+
<a href="{{ url('/%%routeGroup%%%%viewName%%/' . $item->%%primaryKey%% . '/edit') }}" title="Edit %%modelName%%"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>
4444
{!! Form::open([
45-
'method'=>'DELETE',
45+
'method' => 'DELETE',
4646
'url' => ['/%%routeGroup%%%%viewName%%', $item->%%primaryKey%%],
4747
'style' => 'display:inline'
4848
]) !!}
49-
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> Delete', array(
49+
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i>', array(
5050
'type' => 'submit',
5151
'class' => 'btn btn-danger btn-sm',
5252
'title' => 'Delete %%modelName%%',

‎publish/resources/views/admin/activitylogs/index.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
</td>
4444
<td>{{ $item->created_at }}</td>
4545
<td>
46-
<a href="{{ url('/admin/activitylogs/' . $item->id) }}" title="View Activity"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
46+
<a href="{{ url('/admin/activitylogs/' . $item->id) }}" title="View Activity"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
4747
{!! Form::open([
48-
'method'=>'DELETE',
48+
'method' => 'DELETE',
4949
'url' => ['/admin/activitylogs', $item->id],
5050
'style' => 'display:inline'
5151
]) !!}
52-
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> Delete', array(
52+
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i>', array(
5353
'type' => 'submit',
5454
'class' => 'btn btn-danger btn-sm',
5555
'title' => 'Delete Activity',

‎publish/resources/views/admin/pages/index.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
<td>{{ $item->id }}</td>
4040
<td>{{ $item->title }}</td><td>{{ $item->content }}</td>
4141
<td>
42-
<a href="{{ url('/admin/pages/' . $item->id) }}" title="View Page"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
43-
<a href="{{ url('/admin/pages/' . $item->id . '/edit') }}" title="Edit Page"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
42+
<a href="{{ url('/admin/pages/' . $item->id) }}" title="View Page"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
43+
<a href="{{ url('/admin/pages/' . $item->id . '/edit') }}" title="Edit Page"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>
4444
{!! Form::open([
45-
'method'=>'DELETE',
45+
'method' => 'DELETE',
4646
'url' => ['/admin/pages', $item->id],
4747
'style' => 'display:inline'
4848
]) !!}
49-
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> Delete', array(
49+
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i>', array(
5050
'type' => 'submit',
5151
'class' => 'btn btn-danger btn-sm',
5252
'title' => 'Delete Page',

‎publish/resources/views/admin/permissions/index.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
<td>{{ $item->id }}</td>
4141
<td><a href="{{ url('/admin/permissions', $item->id) }}">{{ $item->name }}</a></td><td>{{ $item->label }}</td>
4242
<td>
43-
<a href="{{ url('/admin/permissions/' . $item->id) }}" title="View Permission"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
44-
<a href="{{ url('/admin/permissions/' . $item->id . '/edit') }}" title="Edit Permission"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
43+
<a href="{{ url('/admin/permissions/' . $item->id) }}" title="View Permission"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
44+
<a href="{{ url('/admin/permissions/' . $item->id . '/edit') }}" title="Edit Permission"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>
4545
{!! Form::open([
4646
'method' => 'DELETE',
4747
'url' => ['/admin/permissions', $item->id],
4848
'style' => 'display:inline'
4949
]) !!}
50-
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> Delete', array(
50+
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i>', array(
5151
'type' => 'submit',
5252
'class' => 'btn btn-danger btn-sm',
5353
'title' => 'Delete Permission',

‎publish/resources/views/admin/roles/index.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
<td>{{ $item->id }}</td>
4141
<td><a href="{{ url('/admin/roles', $item->id) }}">{{ $item->name }}</a></td><td>{{ $item->label }}</td>
4242
<td>
43-
<a href="{{ url('/admin/roles/' . $item->id) }}" title="View Role"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
44-
<a href="{{ url('/admin/roles/' . $item->id . '/edit') }}" title="Edit Role"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
43+
<a href="{{ url('/admin/roles/' . $item->id) }}" title="View Role"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
44+
<a href="{{ url('/admin/roles/' . $item->id . '/edit') }}" title="Edit Role"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>
4545
{!! Form::open([
4646
'method' => 'DELETE',
4747
'url' => ['/admin/roles', $item->id],
4848
'style' => 'display:inline'
4949
]) !!}
50-
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> Delete', array(
50+
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i>', array(
5151
'type' => 'submit',
5252
'class' => 'btn btn-danger btn-sm',
5353
'title' => 'Delete Role',

‎publish/resources/views/admin/users/index.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
<td>{{ $item->id }}</td>
4040
<td><a href="{{ url('/admin/users', $item->id) }}">{{ $item->name }}</a></td><td>{{ $item->email }}</td>
4141
<td>
42-
<a href="{{ url('/admin/users/' . $item->id) }}" title="View User"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> View</button></a>
43-
<a href="{{ url('/admin/users/' . $item->id . '/edit') }}" title="Edit User"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
42+
<a href="{{ url('/admin/users/' . $item->id) }}" title="View User"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
43+
<a href="{{ url('/admin/users/' . $item->id . '/edit') }}" title="Edit User"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>
4444
{!! Form::open([
4545
'method' => 'DELETE',
4646
'url' => ['/admin/users', $item->id],
4747
'style' => 'display:inline'
4848
]) !!}
49-
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> Delete', array(
49+
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i>', array(
5050
'type' => 'submit',
5151
'class' => 'btn btn-danger btn-sm',
5252
'title' => 'Delete User',

‎src/LaravelAdminServiceProvider.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use File;
66
use Illuminate\Support\ServiceProvider;
7-
use Setting;
87

98
class LaravelAdminServiceProvider extends ServiceProvider
109
{
@@ -70,6 +69,6 @@ public function register()
7069
'Appzcoder\LaravelAdmin\LaravelAdminCommand'
7170
);
7271

73-
$this->app->bind('Setting', Setting::class);
72+
$this->app->bind('Setting', \Appzcoder\LaravelAdmin\Setting::class);
7473
}
7574
}

0 commit comments

Comments
 (0)