User: amitaibu Branch: DRUPAL-7--1 Date: Wed, 15 Dec 2010 09:14:13 +0000 Added files: /modules/og .project /modules/og/includes og.views.inc og.views_default.inc /modules/og/includes/views og_handler_argument_group_audience_gid.inc og_handler_field_group_audience_state.inc og_handler_field_group_permissions.inc og_handler_field_prerender_list.inc og_handler_field_user_roles.inc og_handler_filter_group_audience_state.inc og_handler_filter_group_state.inc og_handler_relationship.inc /modules/og og.api.php og.field.inc og.info og.install og.module og.test /modules/og/og_access og_access.test /modules/og/og_context og_context.api.php /modules/og/og_field_access og_field_access.test /modules/og/plugins/access og_entity_type.inc og_is_node_group.inc og_is_node_group_content.inc og_perm.inc /modules/og/plugins/arguments og_gid.inc /modules/og/plugins/contexts og_group.inc /modules/og/plugins/relationships og_group_from_node.inc /modules/og/scripts generate-og-d6-content.php Removed files: /modules/og/og/includes og.views.inc og.views_default.inc /modules/og/og/includes/views og_handler_argument_group_audience_gid.inc og_handler_field_group_audience_state.inc og_handler_field_group_permissions.inc og_handler_field_prerender_list.inc og_handler_field_user_roles.inc og_handler_filter_group_audience_state.inc og_handler_filter_group_state.inc og_handler_relationship.inc /modules/og/og og.api.php og.field.inc og.info og.install og.module /modules/og/og/tests og.test Modified files: /modules/og/og_access og_access.info og_access.install og_access.module /modules/og/og_context/includes og_context.views.inc /modules/og/og_context/includes/views og_context_plugin_argument_default_group_context.inc /modules/og/og_context og_context.admin.inc og_context.info og_context.install og_context.module /modules/og/og_field_access og_field_access.info og_field_access.module /modules/og/og_language og_language.info og_language.install og_language.module /modules/og/og_node_link og_node_link.info og_node_link.module /modules/og/og_register og_register.info og_register.module /modules/og/og_theme og_theme.info og_theme.install og_theme.module /modules/og/og_ui og_ui.admin.inc og_ui.api.php og_ui.module og_ui.pages.inc og_ui.test /modules/og/og_views og_views.admin.inc og_views.info og_views.install og_views.module Log message: Sync with github commits: f09d7a2 Assert Xpath, and replace FIXME with TODO. 650a411 Remove todo, as issue solved in Entity API. f60a9db Fix typo in comment. ef53f27 #998246 by idiotprayer: Fixed Fix og_node_links() for content types. 0aa3dc1 #975702 by sven.lauer, Amitaibu: Fixed 6.x to 7.x update hook gets executed on a fresh 7.x install. 716b6bc Add todo for token support. 7b83e3c Remove check for token moudle. 0ad8787 Replace D6 code with a todo. f9a7174 Merge branch 'master' of github.com:amitaibu/og 4afe8e5 Prevent notices if data isn't passed to og_context_create_group(). 3ed6731 Fix wsod on upgrade path. The fact that we rename d6 tables required some workarounds to make sure the new schema is installed properly. 4011bf8 First stab at adding script to generate OG6 content, to be able to test upgrade path. 98350c4 Merge branch 'master' of github.com:amitaibu/og a0b9ee9 Fix failling tests as entity now has entity_feature. Also cleanup a bit variable names. f13a097 Move field creation to hook_install. 1e25896 #990634 Reported by DamienMcKenna: Changed Move og.module into main project directory. d3c179f Merge branch 'master' of github.com:amitaibu/og 281da6e #990626 by the greenman: Fixed og_field_widget_error() does not quite work. 5d929d0 Revmove commented debug function. 5a2519f Remove the form clone, as it's too paranoid. 2f485b3 Fix field access doesn't handle field edit correctly. ea193a5 The node-link view was a bad idea, it's easier to get better results using Panels. e7676ca Add redirect back to original page in node-link. 5cca298 Remove hack, and see if we can get og_audience attached to views' dummy objects. 1d8f588 Field access was too stricted with non-members. 4c55862 Add default view for og_node_link. 23172d8 Fix WSOD in argument handler. 66682d7 Remove obsolete define. 46772cf First stab at Organic groups field group audience. fac74c5 Temporary fix for test until Entity API reset cache after save. 5fc2c60 First stab at default access field tests -- still doesn't pass. be1e6db Fix tests, and fix operation form 'edit' to 'update'. 9932adf First stab at og field access tests. fd1da2e Remove TODOs from test comments. ea529d5 Prevent WSOD when permission name is wrong. d57372c Replace 'display' with 'view modes', to crete instances correctly. Now tests really pass \! 629dcfb Fix instance labels. 8f35244 Simplefy og_create_field(). 97ab974 Assert all groups were registered in {node_access}. b78fce9 Grant access when needed to *all* group IDs. 4afb7fd Test "Strict private" variable enabled or disabled. b37956b Fix typo in comment. db95e5d Test group content access, one time when the group is set to be public, and one time private. 81a5336 Add test - Group with access field and group content with different definition from the group. 4896a1f Fix use of wrong field -- og-access tests now pass. 8c8efdc First stab at group content access tests. 0153c13 Rebuild node access, so tests are now passing. d621908 More work on fixing tests. 38ffc4f Unset our temporary property. 82987f4 First stab at og-access tests. Tests still don't pass. 8b27ddd Reported by the greenman - don't ignore strict private variable. 0ea92b9 Fix translate group test. 8df3351 First - none working- stab the node translate group test. d5ca5dc Document hook_og_invalidate_cache() -- which is used instead of an alter function. c66b7ad Fix og roles test, and add missing static cache to invalidate cache. f1f6e89 First stab at fixing role permissions tests. 1542337 Assert user registration to new group. a3b85d8 Move comments to better place in test. b1cea8d Move comments to better place in test. f2be88a Fix CRUD tests, that now pass. 1c9d808 Prevent notice in og_entity_label(). 9f8d4a2 Extend group field test. currently doesn't pass. ebfda11 Uncomment test. 10e4dce First stab at overhaul of group crud tests. 63ce021 #967686 by Amitaibu: Fixed Fix OG update permission. 13e6f49 REmove hardcoded group id. 16365e3 Add group manager details. 31321a9 Use listing API to show people in group. 178a1a9 #911256 by the greenman: Fixed Adding user to a group fails. 482fe40 Add one line comment to og_field_attach_form(). cf73bd9 Simplefy code readbility by using terninary instead of if..else 8454117 Use single function to invalidate cache. 63b724e Update api files and create api.php file for og-context. 9a7b3f9 Fix testing group delete. 3b611d0 Fix WSOD for using wronf field name. 5d64ed3 Use OO delete instead of procedural. d6da047 Use OO save instead of procedural. 5f97d6c Add group-from-node relationship. 308abd1 Add group id to list convert in CTools. ad087e0 Add 'is group/group content' CTools access plugin. 8b0e596 Add Plugin to provide access control based upon group's entity type. 2545880 Comment out a view field change, and add todo. 4c9df61 Use select list instead of radio buttons for fields. ce4949f Fix wrong function names in og_ui test. 7e5987f More fixes to test to prevent WSOD. f32a054 Fix wsod in tests due to wrong module name. 39d4aa4 Follow up - Rename tests name. 6b30842 Rename tests name. f789b04 Add a missing break. 35adbf5 Objects are passed by reference, so clone the . bbf05b0 Fix wrong function names and signatures in OG gid access. f8e42af Use group as object, not array. 93159e7 Fix function names. 8249d9c First stab at CTools arguments. 7d22b1e First stab at adding group context. abf47aa First stab at adding CTools plugins. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/og/.project http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/og.vie... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/og.vie... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/includes/views/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og.api.php http://cvs.drupal.org/diff.php?path=contributions/modules/og/og.field.inc http://cvs.drupal.org/diff.php?path=contributions/modules/og/og.info http://cvs.drupal.org/diff.php?path=contributions/modules/og/og.install http://cvs.drupal.org/diff.php?path=contributions/modules/og/og.module http://cvs.drupal.org/diff.php?path=contributions/modules/og/og.test http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_access/og_ac... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/og_c... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_field_access... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/access/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/access/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/access/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/access/... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/argumen... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/context... http://cvs.drupal.org/diff.php?path=contributions/modules/og/plugins/relatio... http://cvs.drupal.org/diff.php?path=contributions/modules/og/scripts/generat... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_access/og_ac... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_access/og_ac... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_access/og_ac... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/incl... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/incl... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/og_c... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/og_c... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/og_c... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_context/og_c... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_field_access... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_field_access... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_language/og_... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_language/og_... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_language/og_... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_node_link/og... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_node_link/og... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_register/og_... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_register/og_... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_theme/og_the... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_theme/og_the... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_theme/og_the... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_ui/og_ui.adm... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_ui/og_ui.api... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_ui/og_ui.mod... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_ui/og_ui.pag... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_ui/og_ui.tes... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_views/og_vie... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_views/og_vie... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_views/og_vie... http://cvs.drupal.org/diff.php?path=contributions/modules/og/og_views/og_vie...