No subject
Thu Oct 25 19:26:07 UTC 2012
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: 06f79973ff219daeb5c32a1d927addde95c1ea36
https://github.com/okfn/ckan/commit/06f79973ff219daeb5c32a1d927addde95c1ea36
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 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 ckan_deb/usr/lib/ckan/common.sh
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 3016-template-tweaks
Conflicts:
ckan/config/routing.py
some extra offset routes added
Commit: 0e760f9b92c2b8af8d80b9212eb80f25bfa11542
https://github.com/okfn/ckan/commit/0e760f9b92c2b8af8d80b9212eb80f25bfa11542
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Imporve docstring and comment
Compare: https://github.com/okfn/ckan/compare/02481e0dccd9...0e760f9b92c2
----==_mimepart_50c868beb131b_1334d65aec15316c--
More information about the ckan-changes
mailing list