Skip to content
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.

Sign up for GitHub

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

added more entity actions #757

Merged
merged 9 commits into from
May 10, 2019
Merged

added more entity actions #757

merged 9 commits into from
May 10, 2019

Conversation

bjoerne2
Copy link
Contributor

@bjoerne2 bjoerne2 commented May 4, 2019

Adds actions to data records resp. table rows

Customers

  • Activitites
  • Timesheet
  • Create project

Projects

  • Timesheet
  • Create activity

Activities

  • Timesheet
  • Create timesheet

Timesheet and My times

  • Equal actions:
    • Stop (if running)
    • Edit
    • Start again (if finished)

@bjoerne2 bjoerne2 mentioned this pull request May 4, 2019
Closed
kevinpapst
kevinpapst requested changes May 5, 2019
View reviewed changes
Copy link
Member

@kevinpapst kevinpapst left a comment

Choose a reason for hiding this comment

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

Very nice! I have just some small remarks which we could discuss

src/Controller/ActivityController.php Outdated Show resolved Hide resolved
src/Controller/ProjectController.php Outdated Show resolved Hide resolved
templates/macros/actions.html.twig Outdated Show resolved Hide resolved
templates/macros/actions.html.twig Outdated Show resolved Hide resolved
translations/actions.de.xliff Outdated Show resolved Hide resolved
templates/macros/actions.html.twig Show resolved Hide resolved
src/Controller/TimesheetControllerTrait.php Show resolved Hide resolved
@kevinpapst kevinpapst added this to the 1.0 milestone May 5, 2019
@kevinpapst kevinpapst changed the title More actions added more entity actions May 6, 2019
@kevinpapst
Copy link
Member

@bjoerne2 please update your branch, I pushed a change and merged the latest master.
I find the route approach much cleaner, so I changed that for activities and project.
And I added some checks for the visibility, to hide the create buttons for "deactive/invisble" customer and projects.

@kevinpapst kevinpapst merged commit e619b5f into kimai:master May 10, 2019
@kevinpapst
Copy link
Member

Thanks @bjoerne2 for your contribution 👍

@lock
Copy link

lock bot commented Aug 27, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. If you use Kimai on a daily basis, please consider donating to support further development of Kimai.

@lock lock bot locked and limited conversation to collaborators Aug 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kevinpapst kevinpapst kevinpapst approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@bjoerne2 @kevinpapst