Bug/313/datagrid offclick



<!---
@huboard:{"order":220.62499618530273,"milestone_order":339,"custom_state":"ready"}
-->