[ckan-changes] [ckan/ckan] 569428: [#2346] Dashboard_activity_list_html() dosen't pas...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 569428afb3b58c5b126aa1cb66d3b2f712c6489f
      https://github.com/ckan/ckan/commit/569428afb3b58c5b126aa1cb66d3b2f712c6489f
  Author: Yan <yan.rudneko at linkdigital.com.au>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2346] Dashboard_activity_list_html() dosen't pass user id

Load more don't work on Dashboard page, because dashboard_activity_list_html() don't pass id as an argument, so in activity-stream.js the user_activity_list_html() gives us an error.

Fix it by passing id from context as we do with model= context['model']. As a result context['user'] gives us the name of current user and we can use it, because user_activity_list_html() can take both id and username as id.


  Commit: 0bb525d641d45a2b635a6ef09b689e3e96eaf708
      https://github.com/ckan/ckan/commit/0bb525d641d45a2b635a6ef09b689e3e96eaf708
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M ckan/pastertemplates/template/setup.cfg_tmpl

  Log Message:
  -----------
  [#3275] Fix incorrect i18n paths in extension's setup.cfg template.

The i18n paths for `python setup.py extract_messages`, etc. were missing
a `ckanext/<extension name>/` prefix.


  Commit: b8d2e4893ae1e74b5f0a38d50652ea4bdfea919d
      https://github.com/ckan/ckan/commit/b8d2e4893ae1e74b5f0a38d50652ea4bdfea919d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch '2346-dashboard_activity_list_html' of https://github.com/Engerrs/ckan into Engerrs-2346-dashboard_activity_list_html


  Commit: 7480cbf5c85e151fe4254e8315c8e74a6c83c1ff
      https://github.com/ckan/ckan/commit/7480cbf5c85e151fe4254e8315c8e74a6c83c1ff
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch 'Engerrs-2346-dashboard_activity_list_html'


  Commit: 7db10af50f60b3ab6769b141676d047d05ee8943
      https://github.com/ckan/ckan/commit/7db10af50f60b3ab6769b141676d047d05ee8943
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckan/pastertemplates/template/setup.cfg_tmpl

  Log Message:
  -----------
  Merge branch '3275-incorrect-i18n-paths-in-setup.cfg' of https://github.com/torfsen/ckan into torfsen-3275-incorrect-i18n-paths-in-setup.cfg


  Commit: 6033c6ab35256d942e47e407e05a6dec28bbc3ce
      https://github.com/ckan/ckan/commit/6033c6ab35256d942e47e407e05a6dec28bbc3ce
  Author: amercader <amercadero at gmail.com>
  Date:   2016-10-14 (Fri, 14 Oct 2016)

  Changed paths:
    M ckan/pastertemplates/template/setup.cfg_tmpl

  Log Message:
  -----------
  Merge branch 'torfsen-3275-incorrect-i18n-paths-in-setup.cfg'


Compare: https://github.com/ckan/ckan/compare/c17cf77d3112...6033c6ab3525