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.

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

Control which interface can see timers and include closed box timer #38

Merged
merged 6 commits into from
Mar 22, 2019

Conversation

Multiconecta
Copy link
Contributor

This PR solves issue #35 , according to the finds of issue's discussion.

  • Enable setting was removed (no use for it)
  • Timer can be seen in task box when it is closed also (beside status checkbox), that can be disabled on setup page)
  • A new setting disables (default) or enables the visibility of Actualtime times for user in Helpdesk interface (default show timers only in Standard interface)

(default is show times only to users in Standard interface)
Didn't have any purpose, only the first setting for initial tests
@OscarBeiro OscarBeiro added the bug Something isn't working label Mar 21, 2019
@OscarBeiro OscarBeiro added this to the 1.2.0 milestone Mar 21, 2019
@Multiconecta
Copy link
Contributor Author

Found a bug in post-show-item hook, sometimes the item in parameter is not an object, causing a php error. I could find it with a Solution item. It is an array, instead of an object. Patching the function to check if item is an object and also if it has the getType method before invoking it.

Multiconecta and others added 2 commits March 21, 2019 12:00
in post-show-item hook. Usually ['item'] should be a Glpi object
but there are cases where it is just an array (like in Solution case),
that would throw a php error if not tested before.
@xacobofg xacobofg merged commit 48f1491 into ticgal:development Mar 22, 2019
Multiconecta added a commit to Multiconecta/actualtime that referenced this pull request Mar 25, 2019
@Multiconecta Multiconecta deleted the timer_for_others branch March 25, 2019 16:11
xacobofg added a commit that referenced this pull request Mar 28, 2019
Solve errors because of conflicted merges PRs #36, #37 and #38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants