Skip to content
This repository was archived by the owner on Feb 9, 2025. It is now read-only.

Commit d2870f1

Browse files
authored
Update table.blade.php
Fixing #1618
1 parent 626e109 commit d2870f1

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/views/default/table.blade.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ function checkWidth() {
2424
2525
swal({
2626
title: "{{cbLang("confirmation_title")}}",
27-
text: "{{cbLang("alert_bulk_action_button")}} " + title + " ?",
27+
text: "{{cbLang("alert_bulk_action_button")}} " + title + "
28+
",
2829
type: "warning",
2930
showCancelButton: true,
3031
confirmButtonColor: "#008D4C",
@@ -65,8 +66,8 @@ function () {
6566
$colname = $col['label'];
6667
$name = $col['name'];
6768
$field = $col['field_with'];
68-
$width = ($col['width']) ?: "auto";
69-
$style = ($col['style']) ?: "";
69+
$width = (isset($col['width'])) ?$col['width']: "auto";
70+
$style = (isset($col['style'])) ?$col['style']: "";
7071
$mainpath = trim(CRUDBooster::mainpath(), '/').$build_query;
7172
echo "<th width='$width' $style>";
7273
if (isset($sort_column[$field])) {
@@ -95,7 +96,7 @@ function () {
9596

9697
@if($button_table_action)
9798
@if(CRUDBooster::isUpdate() || CRUDBooster::isDelete() || CRUDBooster::isRead())
98-
<th width='{{$button_action_width?:"auto"}}' style="text-align:right">{{cbLang("action_label")}}</th>
99+
<th width='{{ isset($button_action_width)? $button_action_width :"auto"}}' style="text-align:right">{{cbLang("action_label")}}</th>
99100
@endif
100101
@endif
101102
</tr>
@@ -161,8 +162,8 @@ function () {
161162
foreach ($columns as $col) {
162163
if ($col['visible'] === FALSE) continue;
163164
$colname = $col['label'];
164-
$width = ($col['width']) ?: "auto";
165-
$style = ($col['style']) ?: "";
165+
$width = (isset($col['width'])) ?$col['width']: "auto";
166+
$style = (isset($col['style'])) ? $col['style']: "";
166167
echo "<th width='$width' $style>$colname</th>";
167168
}
168169
?>
@@ -414,7 +415,7 @@ class='filter-value-between form-control {{ (in_array($col["type_data"],["date",
414415
<button class="btn btn-primary btn-submit" type="submit">{{cbLang("button_submit")}}</button>
415416
</div>
416417
{!! CRUDBooster::getUrlParameters(['filter_column','lasturl']) !!}
417-
<input type="hidden" name="lasturl" value="{{Request::get('lasturl')?:Request::fullUrl()}}">
418+
<input type="hidden" name="lasturl" value="{{Request::get('lasturl')?Request::get('lasturl'):Request::fullUrl()}}">
418419
</form>
419420
</div>
420421
<!-- /.modal-content -->

0 commit comments

Comments
 (0)