Merge branch 'hotfix/add_more_event_for_admin'

* hotfix/add_more_event_for_admin:
  add admin events tests
  add functional for events
fixed
Merge branch 'hotfix/fix_event_admin_show' into develop

* hotfix/fix_event_admin_show:
  fixed