Adding model-namespace, columns and action options to Generator #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

yajra merged 6 commits into yajra:master from lk77:master

Apr 20, 2017

Merged

Adding model-namespace, columns and action options to Generator #12

yajra merged 6 commits into yajra:master from lk77:master

Apr 20, 2017

Conversation

@lk77

Copy link

Contributor

@lk77 lk77 commented Mar 23, 2017 •

edited

Loading

Hello,

i've added some options to the DataTable Generator :

model-namespace :

allow to overwrite the namespace set in config
implictly enable --model option
usage : --model-namespace="Models\Client"

columns :

allow to set custom columns
usage : --columns="id,label,url,address"

action :

allow to choose the view to use for column action
usage : --action="client.action"

i've also introduced a way to use a custom datatables.stub.

if something is wrong, tell me and i will correct it.

thanks

lk77 and others added 4 commits

March 23, 2017 12:12

@lk77


 Adding model-namespace, columns and action options to Generator

cb49e49

@lk77


 Fix wrong InputOption introduced in cb49e4

78cb9b3

@lk77


 Fix wrong comment @return added in cb49e4

e94e0bf

@lk77


 Fix wrong comment

1aba454

yajra

yajra requested changes

Mar 28, 2017

View reviewed changes

src/Generators/stubs/datatables.stub Outdated

public function query()

{

$query = ModelName::query();

$query = ModelName::select($this->getColumns);

Copy link

Owner

@yajra yajra Mar 28, 2017 •

edited

Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing function call here. I suggest you add a query before select for better IDE support.

$query = ModelName::query()->select($this->getColumns());

src/Generators/DataTablesMakeCommand.php Outdated

return __DIR__ . '/stubs/datatables.stub';

$config = $this->laravel['config'];

return $config->get('datatables.custom_template')

? $config->get('datatables.custom_path') . '/datatables.stub'

Copy link

Owner

@yajra yajra Mar 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use the buttons config namespace and maybe set the key to stub for clarity?

return $config->get('datatables-buttons.stub')

src/Generators/DataTablesMakeCommand.php

return [

['model', null, InputOption::VALUE_NONE, 'Use the provided name as the model.', null],

['action', null, InputOption::VALUE_OPTIONAL, 'Force the use of singular in filename.', null],

['columns', null, InputOption::VALUE_OPTIONAL, 'Use the provided columns.', null],

Copy link

Owner

@yajra yajra Mar 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a better description?

Force the use of singular in filename.

to something like:

Path to action column template.

Copy link

Contributor Author

@lk77 lk77 Mar 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, i've totally messed this, it's a copy/paste of an other package, but i've forgotten to change the description

@yajra

Copy link

Owner

yajra commented Mar 28, 2017

@lk77 as per testing the PR looks good with some minor changes needed. Looking forward to merging this. 👍

@lk77


 Custom stub template set in datatables-buttons namespace

35eb23d

Correcting wrong description and wrong query in datatables.stub

@lk77

Copy link

Contributor Author

lk77 commented Mar 29, 2017

@yajra I've pushed your changes.

yajra

yajra reviewed

Apr 19, 2017

View reviewed changes

src/Generators/stubs/datatables.stub

'DummyColumns'

];

}

Copy link

Owner

@yajra yajra Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excess indent. Please reduce one tab/4 spaces back.

src/Generators/DataTablesMakeCommand.php

* @return string

protected function parseArray($definition, $delimiter = ',', $indentation = 16)

{

Copy link

Owner

@yajra yajra Apr 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think 12 is the proper indention here to have a perfectly aligned columns. $indention = 12

@yajra

Copy link

Owner

yajra commented Apr 19, 2017

@lk77 works like a charm as per testing. Need some more minor updates for proper code style for the generated code and this should be good to go. Thanks a lot!

@lk77


 Correcting code styling of generated columns

4f54ae2

@lk77

Copy link

Contributor Author

lk77 commented Apr 19, 2017

@yajra it's done !

yajra

yajra approved these changes

Apr 20, 2017

View reviewed changes

@yajra yajra merged commit 24db1f6 into yajra:master

Apr 20, 2017

@yajra

Copy link

Owner

yajra commented Apr 20, 2017

Released on v1.3.0 🚀 !

BTW, if you can. Please also send a PR for the official docs @ https://github.com/yajra/laravel-datatables-docs. Thanks!

@lk77

Copy link

Contributor Author

lk77 commented Apr 21, 2017

Ok, it's done. PR #3 on documentation.
Tell me if something is wrong, english is not my first language.

Thanks

Labels

None yet

2 participants

@lk77 @yajra

Uh oh!

Uh oh!

Adding model-namespace, columns and action options to Generator #12

Adding model-namespace, columns and action options to Generator #12

Uh oh!

Conversation

@lk77 lk77 commented Mar 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

@yajra yajra Mar 28, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

@yajra yajra Mar 28, 2017

Choose a reason for hiding this comment

Uh oh!

@yajra yajra Mar 28, 2017

Choose a reason for hiding this comment

Uh oh!

@lk77 lk77 Mar 29, 2017

Choose a reason for hiding this comment

Uh oh!

yajra commented Mar 28, 2017

Uh oh!

lk77 commented Mar 29, 2017

Uh oh!

@yajra yajra Apr 19, 2017

Choose a reason for hiding this comment

Uh oh!

@yajra yajra Apr 19, 2017

Choose a reason for hiding this comment

Uh oh!

yajra commented Apr 19, 2017

Uh oh!

lk77 commented Apr 19, 2017

Uh oh!

yajra commented Apr 20, 2017

Uh oh!

lk77 commented Apr 21, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

@lk77 lk77 commented Mar 23, 2017 •

edited

Loading

@yajra yajra Mar 28, 2017 •

edited

Loading