[ckan-changes] [okfn/ckan] a3d31e: [#1635] user_dictize() don't crash if no context['...

Fri Nov 16 18:17:38 UTC 2012

  Branch: refs/heads/1635-feature-email-notifications-for-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: a3d31e5eadc2b0a4eed282a2a733c5756ae64214
      https://github.com/okfn/ckan/commit/a3d31e5eadc2b0a4eed282a2a733c5756ae64214
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

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

  Log Message:
  -----------
  [#1635] user_dictize() don't crash if no context['user']

Normally 'user' would always be in context (and would be None if no user
was logged in) but if user_dictize() was called via an internal function
calling a logic action function via get_action(), and that internal
function neglected to put 'user': None in context, then user_dictize()
would raise KeyError. (An example of this is the
get_and_send_notifications_for_all_users() that I'm about to commit
after this.)

May as well just behave as if 'user': None was in context instead.

  Commit: 373432f4001273f171d04d4ea48b240c67d64ae7
      https://github.com/okfn/ckan/commit/373432f4001273f171d04d4ea48b240c67d64ae7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

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

  Log Message:
  -----------
  [#1635] Remove an unused variable

  Commit: a678e0e27efb1aaea8fd11bc10f0cb5db709e3d7
      https://github.com/okfn/ckan/commit/a678e0e27efb1aaea8fd11bc10f0cb5db709e3d7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    A ckan/lib/email_notifications.py
    M ckan/logic/action/get.py
    M ckan/model/dashboard.py
    M ckan/model/user.py
    A ckan/tests/lib/test_email_notifications.py

  Log Message:
  -----------
  [#1635] Initial implementation of email notifications for activity streams

ckan/model/user.py
  Added @classmethod all()

ckan/model/dashboard.py
  Added last_activity_stream_email_notification and @classmethods
  get_last_activity_stream_email_notification,
  update_last_activity_stream_email_notification

logic/action/get.py:
 Added dashboard_email_notification_last_sent and get_email_notifications
 actions. These may not really need to be action functions as they may only be
 needed internally.

ckan/lib/email_notifications.py
  This is the email notifier job meant to be run by paster (but there's no
  paster command for it yet)

ckan/tests/lib/test_email_notifications.py
  The beginning of some tests

  Commit: 20e70832b52b088d1f8b4ecad782a641a98797b4
      https://github.com/okfn/ckan/commit/20e70832b52b088d1f8b4ecad782a641a98797b4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/lib/activity_streams.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/061_add_follower__group_table.py
    M ckan/model/__init__.py
    M ckan/model/follower.py
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/iehacks.less
    A ckan/templates/ajax_snippets/popover-context-group.html
    A ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    A ckan/templates/group/admins.html
    A ckan/templates/group/followers.html
    M ckan/templates/group/read.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M doc/common-error-messages.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1635-feature-email-notifications-for-activity-streams

Conflicts:
	ckan/public/base/less/iehacks.less

Compare: https://github.com/okfn/ckan/compare/a3d31e5eadc2^...20e70832b52b