Skip to content

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
z-song authored and StyleCIBot committed Sep 6, 2020
1 parent aad9d30 commit fa46fdf
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
10 changes: 5 additions & 5 deletions resources/lang/tr/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
'filter_clear' => 'Tümünü göster',
'filter_placeholder' => 'Filtrele',
],
'menu_titles' => [],
'menu_titles' => [],
'table_items_selected' => '{n} öğe seçildi',
'menu_titles' => [],
'prev' => 'Önceki',
'next' => 'Sonraki',
'quick_create' => 'Hemen oluştur',
'menu_titles' => [],
'prev' => 'Önceki',
'next' => 'Sonraki',
'quick_create' => 'Hemen oluştur',
];
8 changes: 4 additions & 4 deletions resources/lang/zh-CN/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
'filter_placeholder' => '过滤',
],
'table_items_selected' => '已选择 {n} 项',
'menu_titles' => [],
'prev' => '上一步',
'next' => '下一步',
'quick_create' => '快速创建',
'menu_titles' => [],
'prev' => '上一步',
'next' => '下一步',
'quick_create' => '快速创建',
];
4 changes: 2 additions & 2 deletions src/Form/Field/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function disable($disabledDates = null)
}

/**
* {@inheritDoc}
* {@inheritdoc}
*/
public function prepare($value)
{
Expand All @@ -110,7 +110,7 @@ public function prepare($value)
}

/**
* {@inheritDoc}
* {@inheritdoc}
*/
public function render()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function create(Content $content)
}

/**
* @param Form $form
* @param Form $form
* @param Content $content
*
* @return mixed
Expand All @@ -125,7 +125,7 @@ public function renderModalForm($form, $content)
$crawler->filter('form')->outerHtml(),
Admin::style(),
Admin::html(),
Admin::script()
Admin::script(),
]);
}
}
3 changes: 2 additions & 1 deletion src/Table/Actions/EditModal.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
class EditModal extends Edit
{
/**
* @return string
* @throws \Throwable
*
* @return string
*/
public function render()
{
Expand Down
1 change: 0 additions & 1 deletion src/Table/Displayers/DropdownActions.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public function add(RowAction $action)
protected function prependDefaultActions()
{
foreach ($this->defaultClass as $class) {

if ($this->table->modalForm && $class == Edit::class) {
$class = EditModal::class;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Table/Displayers/Expand.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function display($callback = null, $isExpand = false)
return Admin::view('admin::components.column-expand', [
'key' => $this->getKey(),
'url' => $this->getLoadUrl(),
'name' => str_replace('.', '-', $this->getName()) . '-' . $this->getKey(),
'name' => str_replace('.', '-', $this->getName()).'-'.$this->getKey(),
'html' => $html,
'value' => $this->value,
'async' => $async,
Expand Down
2 changes: 1 addition & 1 deletion src/Table/Tools/CreateButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function render()
}

return Admin::view('admin::table.create-btn', [
'url' => $this->table->getCreateUrl(),
'url' => $this->table->getCreateUrl(),
'modal' => $this->table->modalForm,
]);
}
Expand Down
7 changes: 4 additions & 3 deletions src/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,14 @@ function admin_login_page_backgroud()

/**
* @param string $view
* @param array $data
* @return string
* @param array $data
*
* @throws Throwable
*
* @return string
*/
function admin_view($view, $data = [])
{
return Admin::view($view, $data);
}

}

0 comments on commit fa46fdf

Please sign in to comment.