[ckan-changes] [ckan/ckan] 5fb7d0: Fix some flask template things - request.params->r...

David Read noreply at github.com
Sat Feb 2 23:10:08 UTC 2019


  Branch: refs/heads/3484_revision_ui_removal2
  Home:   https://github.com/ckan/ckan
  Commit: 5fb7d07ec6534dd7fc4e93a24148b82455cab110
      https://github.com/ckan/ckan/commit/5fb7d07ec6534dd7fc4e93a24148b82455cab110
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-02-02 (Sat, 02 Feb 2019)

  Changed paths:
    M ckan/templates-bs2/package/read.html
    M ckan/templates-bs2/package/resource_read.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resources.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  Fix some flask template things - request.params->request.args and url_for.


  Commit: a8d466da365f8ce8b08ab98b2111a361002184d4
      https://github.com/ckan/ckan/commit/a8d466da365f8ce8b08ab98b2111a361002184d4
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-02-02 (Sat, 02 Feb 2019)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Fix bug where calling logic.action.get:dashboard_activity_list() was affecting the pkg_dict in an activity list used by dataset_follower_count() - using copy.


  Commit: 99942013fa7c818d833541315fb84f234586f85d
      https://github.com/ckan/ckan/commit/99942013fa7c818d833541315fb84f234586f85d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-02-02 (Sat, 02 Feb 2019)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates-bs2/package/base.html
    M ckan/templates-bs2/package/base_form_page.html
    M ckan/templates-bs2/package/read_base.html
    M ckan/templates-bs2/package/resource_read.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resources.html
    M ckan/templates-bs2/package/snippets/resources_list.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  Fixes for templates when viewing old datasets

* Remove c.revision_date and c.revision_id stuff from templates - that was how old datasets were shown before this PR.
* Change links from pkg.name to pkg.id when viewing an old dataset version (i.e. when is_activity_archive=True) because package.name may not be current. Instead we create the link with package.id and let CKAN redirect the user. Because of this we need to pass is_activity_archive to both package/snippets/resource_item.html and package/snippets/resources.html which have links.
* Hide 'download_resource_button' when viewing an old dataset version (i.e. when is_activity_archive=True) because the datastore will be the latest version of the data, not the old version that matches the metadata.


  Commit: d7fda7acb1c6e17540b29dd4eaf79ba65fe96f96
      https://github.com/ckan/ckan/commit/d7fda7acb1c6e17540b29dd4eaf79ba65fe96f96
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2019-02-02 (Sat, 02 Feb 2019)

  Changed paths:
    M ckan/templates-bs2/package/snippets/info.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resources_list.html
    M ckan/templates-bs2/package/snippets/tags.html
    M ckan/templates-bs2/snippets/tag_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/snippets/tag_list.html
    M ckan/views/dataset.py
    M ckan/views/resource.py

  Log Message:
  -----------
  Fix comma missing in resource_read.html and template docs

* Don't display resource preview when viewing an old dataset version (i.e. when is_activity_archive=True) because the datastore will be the latest version of the data, not the old version that matches the metadata.
* Fix comma missing in ckan/templates/package/resource_read.html
* Improve docs of the package html


Compare: https://github.com/ckan/ckan/compare/0e9fc05b73ab...d7fda7acb1c6


More information about the ckan-changes mailing list