[ckan-changes] [ckan/ckan] b7626c: [#2512] fix group and org deletion

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: b7626cc2ab5d1b00e4e6fcb274da6f452d7f97b6
      https://github.com/ckan/ckan/commit/b7626cc2ab5d1b00e4e6fcb274da6f452d7f97b6
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/confirm_delete.html
    A ckan/tests/controllers/test_organization.py

  Log Message:
  -----------
  [#2512] fix group and org deletion

change controller to check for the correct group type,
self.group_type is now self.group_types


  Commit: 29576f528c6b477965dc58509939eb2c4f2f1813
      https://github.com/ckan/ckan/commit/29576f528c6b477965dc58509939eb2c4f2f1813
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-02 (Thu, 02 Jul 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/confirm_delete.html
    A ckan/tests/controllers/test_organization.py

  Log Message:
  -----------
  Merge pull request #2512 from joetsoi/2512-fix-group-org-deletion

delete organizations causes 500 errror


Compare: https://github.com/ckan/ckan/compare/97b91f796807...29576f528c6b