[ckan-changes] [okfn/ckan] e27b46: First version of the loading of more items in the ...

Wed Dec 12 08:51:00 UTC 2012

  Branch: refs/heads/2939-orgs
  Home:   https://github.com/okfn/ckan
  Commit: e27b46b4e0161b39463fcfdf8e9aefe8f5e4409c
      https://github.com/okfn/ckan/commit/e27b46b4e0161b39463fcfdf8e9aefe8f5e4409c
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-14 (Wed, 14 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    A ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/package/activity_stream.html
    M ckan/templates/package/read.html
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  First version of the loading of more items in the activity streams

  Commit: 72d33301c31a06362aaef8bff8bf5815b7595585
      https://github.com/okfn/ckan/commit/72d33301c31a06362aaef8bff8bf5815b7595585
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/activity-stream.js

  Log Message:
  -----------
  Added doc blocks and infinite scrolling on the activity streams

  Commit: 3836d3a2cbba67811d0c224549bd2b80f193db26
      https://github.com/okfn/ckan/commit/3836d3a2cbba67811d0c224549bd2b80f193db26
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/get.py
    A ckan/migration/versions/062_add_dashboard_table.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    A ckan/model/dashboard.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dashboard.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/functional/api/test_activity.py
    A ckan/tests/functional/api/test_dashboard.py
    M ckan_deb/usr/lib/ckan/common.sh
    A doc/architecture.rst
    R doc/buildbot.rst
    R doc/coding-standards.rst
    M doc/common-error-messages.rst
    A doc/contributing-docs.rst
    A doc/contributing.rst
    A doc/css-coding-standards.rst
    M doc/datastore-setup.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-coding-standards.rst
    A doc/migration.rst
    A doc/python-coding-standards.rst

  Log Message:
  -----------
  Merged master back into branch

  Commit: cdf6da0c9e0865042266901e7681ca1f4c8ebc2c
      https://github.com/okfn/ckan/commit/cdf6da0c9e0865042266901e7681ca1f4c8ebc2c
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

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

  Log Message:
  -----------
  Fix after merge

  Commit: a2423eb8849b5b2b837acfd5bff822dd41b03712
      https://github.com/okfn/ckan/commit/a2423eb8849b5b2b837acfd5bff822dd41b03712
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

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

  Log Message:
  -----------
  Changed param ordering of offset and limit within activity_list functions

  Commit: 0094cb71140634e0650d9035615d87b63a33c944
      https://github.com/okfn/ckan/commit/0094cb71140634e0650d9035615d87b63a33c944
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

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

  Log Message:
  -----------
  Removed uneeded print

  Commit: 88d0aafe484bc1d589ab4955cd7883f9e1a3519f
      https://github.com/okfn/ckan/commit/88d0aafe484bc1d589ab4955cd7883f9e1a3519f
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  Code cleanup

  Commit: 52cf81fe051ddd6e0819d6221f7d7f3f1444205e
      https://github.com/okfn/ckan/commit/52cf81fe051ddd6e0819d6221f7d7f3f1444205e
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

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

  Log Message:
  -----------
  Few code style tweaks

  Commit: 5f2429b5a35fe666e90f9ab3b0a5210a1b712a3c
      https://github.com/okfn/ckan/commit/5f2429b5a35fe666e90f9ab3b0a5210a1b712a3c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    A ckan/templates/package/activity.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merged master back into branch

  Commit: ce822a563019c119be43f470d3a4a710e8c1e2f0
      https://github.com/okfn/ckan/commit/ce822a563019c119be43f470d3a4a710e8c1e2f0
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

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

  Log Message:
  -----------
  Fix after merge

  Commit: 2f2368d52fa5623fa256c17bd1b282e52e21c00c
      https://github.com/okfn/ckan/commit/2f2368d52fa5623fa256c17bd1b282e52e21c00c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-05 (Wed, 05 Dec 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Revert incorrect doc changes from confusing merge

  Commit: 0f5ffac1d6e8af82aa002cf36220ee37f571dec5
      https://github.com/okfn/ckan/commit/0f5ffac1d6e8af82aa002cf36220ee37f571dec5
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/lib/base.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py

  Log Message:
  -----------
  pep8 tweak, doc block and comma add. yuk.

  Commit: 4afc00d3d39cee3fa6588dc6d61af7fdc39bc09d
      https://github.com/okfn/ckan/commit/4afc00d3d39cee3fa6588dc6d61af7fdc39bc09d
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Fix for indentation error

  Commit: dd521acb113810ec0ab39cffc21203bcb7f13e99
      https://github.com/okfn/ckan/commit/dd521acb113810ec0ab39cffc21203bcb7f13e99
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Removed uneeded offset that got included from confusing merge

  Commit: dc2baa692e828c950b879d8cf45520c07e80624a
      https://github.com/okfn/ckan/commit/dc2baa692e828c950b879d8cf45520c07e80624a
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Doc block for new method

  Commit: 2e40147f6a5f92a1baebf488ac5895300d840077
      https://github.com/okfn/ckan/commit/2e40147f6a5f92a1baebf488ac5895300d840077
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

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

  Log Message:
  -----------
  Doc block additions

  Commit: 2cb80ce87524dd0d92b98072a7be9b8735d30374
      https://github.com/okfn/ckan/commit/2cb80ce87524dd0d92b98072a7be9b8735d30374
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

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

  Log Message:
  -----------
  [#3018] Small docstring and param name tweak

  Commit: 44833cd3e8e0bf8a86dd4d07c6b5bab87f07caa1
      https://github.com/okfn/ckan/commit/44833cd3e8e0bf8a86dd4d07c6b5bab87f07caa1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

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

  Log Message:
  -----------
  [#3018] Clean up some docstrings formatting

  Commit: 47a07fba543113b20f84dc79916b7fb60810fc4f
      https://github.com/okfn/ckan/commit/47a07fba543113b20f84dc79916b7fb60810fc4f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M test-core.ini

  Log Message:
  -----------
  [#3018] Add ckan.activity_list_limit setting

Add `limit` param to activity stream action functions.

Remove default limit and offset values from model/activity.py, handling the
options and defaults has moved into the logic package.

Add ckan.activity_list_limit = 15 to test-core.ini, the failing activity
streams tests pass now.

  Commit: 25b54bedb1fa08d9e82e13cffbf085d41c30794d
      https://github.com/okfn/ckan/commit/25b54bedb1fa08d9e82e13cffbf085d41c30794d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M ckan_deb/usr/lib/ckan/common.sh

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3018-activity-streams-load-more

  Commit: c703e495ec451adc12bf3edb7cf4c23f839c9423
      https://github.com/okfn/ckan/commit/c703e495ec451adc12bf3edb7cf4c23f839c9423
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#3018] Updated template to use new config option

>From feedback from @seanh see: https://github.com/okfn/ckan/pull/171#discussion_r2348697

  Commit: 1daea396bccb3ca57725aa90267ee72bce0726fd
      https://github.com/okfn/ckan/commit/1daea396bccb3ca57725aa90267ee72bce0726fd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Make recently_changed_packages_activity_stream a helper

recently_changed_packages_activity_stream was an @property of the
HomeController, but it wasn't working, accessing the property just
returned a property object e.g. <property object at 0x7f7210087e68> not
the HTML string as desired.

I think this is because the @property was declared inside a method, and
properties only work at class-level.

The @property cannot simply be moved to class level because it uses
`context`, a param of the index() function it was defined in.

Instead move recently_changed_packages_activity_stream into helpers.py,
where any template (not just the front page) can access it like this:

    {{ h.recently_changed_packages_activity_stream() }}

dashboard_activity_stream is already done the same way (but other
activity streams are not).

This means any existing home/index.html templates that were accessing
recently_changed_packages_activity_stream as an attribute of the
template context itself, will no longer work. However, apparently they
weren't working anyway.

  Commit: 60d638414b54a2126dd0346189ac78337c62c697
      https://github.com/okfn/ckan/commit/60d638414b54a2126dd0346189ac78337c62c697
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#3018] Added type cast to config item in template

After feedback from @tobes at https://github.com/okfn/ckan/pull/171#commitcomment-2287166

  Commit: 09059f6198922a1b1175f0811520328c7e93e527
      https://github.com/okfn/ckan/commit/09059f6198922a1b1175f0811520328c7e93e527
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Added ISearchFacets plugin interface

  Commit: 1636f4b8277d1974241f8434ede8cdf8f554a6e6
      https://github.com/okfn/ckan/commit/1636f4b8277d1974241f8434ede8cdf8f554a6e6
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Moved update_facet_titles to IPackageController

  Commit: 798004fb5c449005e82f0c81df30a93a9061c9b0
      https://github.com/okfn/ckan/commit/798004fb5c449005e82f0c81df30a93a9061c9b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Clean whitespace errors

  Commit: 0c7d76c225299adef206f7cd7e603d0d692ac541
      https://github.com/okfn/ckan/commit/0c7d76c225299adef206f7cd7e603d0d692ac541
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge branch 'master' into 3018-activity-streams-load-more

  Commit: c127fa642dd8bd8e1cbe25217d19a39b3c00bfcf
      https://github.com/okfn/ckan/commit/c127fa642dd8bd8e1cbe25217d19a39b3c00bfcf
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Fix tests

  Commit: 67a6121e8c597a157e6b0064764b0da62f17b488
      https://github.com/okfn/ckan/commit/67a6121e8c597a157e6b0064764b0da62f17b488
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    A ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/package/activity_stream.html
    M test-core.ini

  Log Message:
  -----------
  Merge branch '3018-activity-streams-load-more'

  Commit: 15eb468c2a5faee61608c482c98c04e57e84c85a
      https://github.com/okfn/ckan/commit/15eb468c2a5faee61608c482c98c04e57e84c85a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/package/activity_stream.html
    M ckan/tests/functional/test_package.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 2939-orgs

Conflicts:
	ckan/lib/helpers.py

    trivial merge new functions in org branch and
    dashboard_activity_stream() has offset param added

  Commit: 072ba8152c1d46c0b483b57fbd9df6eaa4740e60
      https://github.com/okfn/ckan/commit/072ba8152c1d46c0b483b57fbd9df6eaa4740e60
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  [#2939] Sean's dashboard test shim - Thanks sean

  Commit: 88e8532145d521a449d040d8171a5160c49181dc
      https://github.com/okfn/ckan/commit/88e8532145d521a449d040d8171a5160c49181dc
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [#2939] Fix group pending package test

  Commit: a2958bc0bacd239a18c3d7bb49ef7f573419b83f
      https://github.com/okfn/ckan/commit/a2958bc0bacd239a18c3d7bb49ef7f573419b83f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#2939] Sysadmins have all the permissions

Compare: https://github.com/okfn/ckan/compare/cdc8ee80543d...a2958bc0bacd