[ckan-changes] [okfn/ckan] 9acc9e: [i18n] Mark 2 resource form strings for i18n

Thu Aug 9 19:21:59 UTC 2012

  Branch: refs/heads/feature-2536-clean-activity-stream
  Home:   https://github.com/okfn/ckan
  Commit: 9acc9ea27723ed4ee90380512652f7c37114b18f
      https://github.com/okfn/ckan/commit/9acc9ea27723ed4ee90380512652f7c37114b18f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  [i18n] Mark 2 resource form strings for i18n

  Commit: 613322a3cbb0041815fb9118b372cd9404c2e1a4
      https://github.com/okfn/ckan/commit/613322a3cbb0041815fb9118b372cd9404c2e1a4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

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

  Log Message:
  -----------
  [#2777] Use user_list_dictize

  Commit: fbefe8cb730e24edd47a5454bdcdd53473b221f5
      https://github.com/okfn/ckan/commit/fbefe8cb730e24edd47a5454bdcdd53473b221f5
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

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

  Log Message:
  -----------
  Merge branch '2777-defect-user-show'

  Commit: 6a48063b971a5f6813c5034eace85e479b5308df
      https://github.com/okfn/ckan/commit/6a48063b971a5f6813c5034eace85e479b5308df
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2750] Fix group controller using wrong schema

Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()

  Commit: 3ed510b2da164e566fc2c23eee84a495f6800cb3
      https://github.com/okfn/ckan/commit/3ed510b2da164e566fc2c23eee84a495f6800cb3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Refactor DefaultGroupForm's form_to_db_schema_options()

The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored.  Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.

  Commit: 5c63f301ae22f6f54a62afa0d0211be3cee628cb
      https://github.com/okfn/ckan/commit/5c63f301ae22f6f54a62afa0d0211be3cee628cb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#2570] Fix IGroupForm check_data_dict not being called

Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.

  Commit: e2073a37ac16acb1233a19f42d6473e0a2065b75
      https://github.com/okfn/ckan/commit/e2073a37ac16acb1233a19f42d6473e0a2065b75
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Be more careful when prepending site_url

  Commit: bd860dc58758356f36518586d1b70e1079700ba2
      https://github.com/okfn/ckan/commit/bd860dc58758356f36518586d1b70e1079700ba2
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2784] Hand control of user's sensitive data to user_dictize.

Only a sysadmin or the owner of the account may view a user's apikey
or reset_key.

This does not change behaviour of the actions; just moves the logic
form the actions to the model dictize layer.

  Commit: 7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
      https://github.com/okfn/ckan/commit/7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  [#2784] Allow users to see their apikey when creating or updating themselves.

  Commit: 99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
      https://github.com/okfn/ckan/commit/99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan

  Commit: 21ca66c77e9a618cec24709430e73c4409c1ac2c
      https://github.com/okfn/ckan/commit/21ca66c77e9a618cec24709430e73c4409c1ac2c
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2784] User email is treated as sensitive data

  Commit: d7408ff17d167d753b08acd62747d661d664e833
      https://github.com/okfn/ckan/commit/d7408ff17d167d753b08acd62747d661d664e833
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

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

  Log Message:
  -----------
  [#2784] Set user domain object in 'user_obj' in context instead of 'user'

  Commit: b04aa652d235bd88e37e07c9652a08c144c41176
      https://github.com/okfn/ckan/commit/b04aa652d235bd88e37e07c9652a08c144c41176
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Fix a db_to_form_package_schema() crash

When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.

Extremely difficult to debug.

This seems to fix it.

  Commit: 1593e75f8702d1152460a21ec2b6e5082fd78ec4
      https://github.com/okfn/ckan/commit/1593e75f8702d1152460a21ec2b6e5082fd78ec4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  Merge branch 'master' into feature-2536-clean-activity-stream

  Commit: 1fd98fc3e4fac2a559b8b50499829ed8da3844b7
      https://github.com/okfn/ckan/commit/1fd98fc3e4fac2a559b8b50499829ed8da3844b7
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch '2784-model-dictize-sensitive-data'

  Commit: f67c571be2c0653a9ae3d67a9a35e61a7329541e
      https://github.com/okfn/ckan/commit/f67c571be2c0653a9ae3d67a9a35e61a7329541e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2755] Don't call user_show twice

  Commit: 57b308e54268456ff375d4dd7bdc404bbad9a901
      https://github.com/okfn/ckan/commit/57b308e54268456ff375d4dd7bdc404bbad9a901
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    A ckan/templates/activity_streams/activity_stream_item.html
    R ckan/templates/activity_streams/general.html

  Log Message:
  -----------
  [#2536] Minor activity streams tidying

For any activity with one activity detail the detail will be
rendered instead of the activity, not just changed packages.

Some comments and PEP8 tidy up.

Rename general.html to activity_stream_item.html

  Commit: 1763a8363f27924ee0f389a395c8102587a9b589
      https://github.com/okfn/ckan/commit/1763a8363f27924ee0f389a395c8102587a9b589
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    R ckan/lib/activity.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/model/meta.py

  Log Message:
  -----------
  Rename activity.py -> activity_streams_session_extension.py

To make it clear what the difference is between lib/activity_streams.py
and lib/activity_streams_session_extension.py (previously
lib/activity.py)

  Commit: 1ae2c22c3caebe9c282157b602f1f92153e268d9
      https://github.com/okfn/ckan/commit/1ae2c22c3caebe9c282157b602f1f92153e268d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2536-clean-activity-stream

Compare: https://github.com/okfn/ckan/compare/548de8ee761a...1ae2c22c3cae