diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 462d0b0..720904e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,403 +1,146 @@ -Current API VERSION: 5. +Current API VERSION: 4. -Bean 7.x-1.8, 2014-10-02 ---------------------------- -#2175309 by jeffam: Added Block add/edit pages can still use site theme when an admin theme is enabled. -#2148923 by codeamatic, nielsdefeyter, lahode: Fixed Unable to translate bean blocks. -#2201503 by jlyon, sherakama | ibotvinn: Fixed Block cache not flushed after editing a bean. -#2337555 by catch: Add static caching to bean_load_delta(). - -Bean 7.x-1.7, 2013-11-29 ---------------------------- -#2145333 by chris.jichen: Fixed misspelling of entity_access in views plugin - -Bean 7.x-1.6, 2013-11-20 ---------------------------- -#2138651 by indytechcook: Add deploy_managed_ui_form_elements() to edit/create form. -#1941168: Add back in missing setDefault method on bean class. -#1957986 by sylus: Bean + UUID / Deploy. -#2112567 by webflo: Make access controller swappable. -#2115463 by webflo: Page title is escaped twice. -#1684250 by rimen, foopang: Transliteration module integration fix. -#2117223 by jrbeeman: Static cache bean_block_info(). -#2123053 by dagmar: Uninstalling Bean when Shortcut module is disabled produces a fatal error. -#2114279 by kingandy: Block cache flush introduces Block module dependency. - -Bean 7.x-1.5, 2013-10-23 ---------------------------- -by DamienMcKenna: Fixed arbitrary tag in the bean title input. - -Bean 7.x-1.4, 2013-10-13 ---------------------------- -#2080239 by ro0NL: Bean export type is internally translated -#2061725 by timaholt: support UUID for revisions -#2076133 by Sylvain Lecoy: Align admin/structure text with drupal standards -#1359472 by arithmetric: Fix uninstall of bean module plugins -#2053911 by franz: When no Bean type is created, views_handler_filter_bean_type - return many errors. -#2095595 by SpadXIII: Fixed Revision stores wrong uid. -#1891210 by valderama, guillaumev: Fixed Incompatible with entity reference - formatter Rendered Entity. -#1891928 by jeffam | indytechcook: Fixed Block reference not picking up bean - module blocks. -#2108631 by webflo: Fixed Add access checks to default Bean Admin UI. - -Bean 7.x-1.3, 2013-07-24 ----------------------------- -#2036137 by eugene.ilyin: Fixed Numeric delta of the bean block. - Followup by brantwynn Fix block delta truncation error. -#1728632 by donutdan4114 | indytechcook: Fixed Can't name a bean type 'bean'. -#1982468 by 30equals: Cleanup menulink/shortcut after uninstall - -Bean 7.x-1.2, 2013-05-12 ----------------------------- -#1924126 by DamienMcKenna: Group beans by block type in the CTools/Panels content -type (sic) plugin -#1978808 by k.minkov: Assign bean object to form on insert -#1990112 by rodrigo panchiniak fernandes: Minor Typo at README.txt -#1961464 by jamsilver: Extra fields needed for label, revision and view_mode -form elements. -#1973696 by pcambra: Fix bean.api.php to set path and file in the class level. -#1935770 by rooby: Beans without a title should not fallback to showing the -admin label but instead show no title at all -#1957260 by DamienMcKenna: There is no $langcode argument for - field_attach_form_validate(). -#1935466 by jeffam, DamienMcKenna: Improve integration with Admin Menu module. -#1934294 by darthsteven: Entity Cache Support. -#1906958 by ytsurk, Albert Volkman, miro_dietiker: Added Switch admin - bean/block list to views. -#1935770 by rooby: fixed erronous block titles showing up as labels. -#1179420 by mrfelton: Unable to install Bean plugins from an installation - profile, switched to ctools style plugin naming. -#1941168 by DamienMcKenna, Albert Volkman: Fixed the 'set active' URL. -#1911224 by DamienMcKenna: Reverted support for references_dialog, that module - already added support for Bean. - - -Bean 7.x-1.1, 2013-02-27 ------------------------- -#1911224 by DamienMcKenna: Added Support for references_dialog(). -#1910566 by Bès: Added Use label of view mode in bean add and edit form. -#1912444 by John Bickar: Fixed Fatal Error: Call to undefined function - entity_language(). -#1354824 by DamienMcKenna, willvincent | mrfelton: Fixed Unable to add fields to - newly created bean type. -#1918188 by eugene.ilyin: Added Few useful views handlers for work with bean - blocks. -#1916938: Fixed Empty block name in entity reference field. -#1924006 by DamienMcKenna: Added Convert bean URL to lowercase. -#1920296 by fubhy | indytechcook: Fixed Can't delete revisions. - - -Bean 7.x-1.0, 2013-02-01 ------------------------- -#1850948 by indytechcook: Fixed Bean revision fields are not accessible in - EntityFieldQuery. - - -Bean 7.x-1.0-rc10, 2013-02-01 ------------------------------ -Make sure bean_reset rebuilds the menu correctly. -Fix issue in install of shortcuts. -#1691482: Moved contextual links back to bean_view and check that return of - plugin is a render array -#1891532: Remove check_plain from bean entity class -#1897834 Fixed Bean, Features and permissions. -#1900104: Fixed Error when disabling bean. -#1892272 by stijndm: Fixed Unable to edit exported bean types due to form API - syntax error. - - -Bean 7.x-1.0-rc9, 2013-01-21 ----------------------------- -#1885958 by Steven Jones: Added EntityMetadataWrapper sets not working. -#1893950: Fixed Ctools warnings in log. -Move check_plain into the entity class. -#1887778 by Deciphered: Fixed Incorrect operations colspan. -#1891358 by DamienMcKenna: Fixed Data loss if both 'Create new revision" and - "Set Revision as default" options unchecked. -#1886002 by DamienMcKenna | paulhhowells: Fixed Administer Bean Settings x2. -#1889892 Fixed bean_reset() calls menu_rebuild(), which already happens during - drupal_flush_all_caches(). - - -Bean 7.x-1.0-rc8, 2013-01-10 ----------------------------- -Remove batches and use correct cache clear function. -#1883232 by Steven Jones: Fixed Bean EntityMetadataWrapper integration broken. -Fix bean unit test. -#1885238 by indytechcook: Fixed xss bean type label not escaped sufficiently. - - -Bean 7.x-1.0-rc7, 2012-12-31 ----------------------------- -#1828096 by Brandonian: Fixed bean_update_7007 does not work with real-world - data. -#1691482 by Brandonian | mrfelton: Fixed contextual links not working. -#1601960 by indytechcook Fixed [bean_all()] Endless recursion in combination - with Views. -#1611676 by barraponto | hazah: Added Views filter by bean type. -#1799776 by bforchhammer: Fixed entity translation regressions. -#1710256 by jonhattan, indytechcook: Fixed «Delete block type» button - misplaced. -#1785950 by jonhattan | indytechcook: Fixed Revert and delete should be separate - operations. -#1786036 by jonhattan | indytechcook: Fixed Caches not completely cleared. -Integrate Bean Revisions -#1814068 by jonhattan: Remove leftover patch files in repo. -#1833176 by darrenmothersele: Fixed List Shortcut module as a dependency or - remove from bean_install(). -#1836798 by bhauff: Block Label used rather than Title on block/delta and - block/delta/view. -#1844538 by mrfelton: Fixed Field data missing when editing language neutral - beans. -#1839966 by ultimateboy: Fixed block/add doesn't check for access before - generating list. -#1838088 by jamesharv: Fixed Adding bean type and permissions to existing - features module can cause drush cache clear to fail. -#1845974 by indytechcook: Fixed Block Admin label is correct. -#1793586 by Mixologic | indytechcook: Fixed Editing Bean Content Does not - Trigger Page Cache Clear. -#1870730 by jm.federico: Fixed bean_view() changes the current page title. -#1859450 by jonhattan: Drop dependency on block.module. - - -Bean 7.x-1.0-rc6, 2012-09-05 ----------------------------- -#1649312: Bean Usage sub-module. -#1691458 by mrfelton: Fixed Unable to access bean overview page unless - administer bean permissions is granted. -#1698548 by rsaddington: Fixed Block types tables has too many td's. -#1534722 by broeker, skwashd | tanc: Added Make custom bean forms compatible - with Display Suite. -#1684250 by rimen|indytechcook: Transliteration module integration. -#1663264 by brantwynn: Fixed Status Message Text is wrong during Bean Create and - Update. -#1717540 by jonhattan: Fixed [bean_all()] Fatal error when creating a block - instance. -#1751268 by skwashd: Added Support Services API v3002. -#1770190 by bforchhammer: Fixed entity translation integration. -#1535444 by indytechcook: Fixed display of permission description. - - -Bean 7.x-1.0-rc5, 2012-06-03 ----------------------------- -Fixed unit testing issues with Bean permissions. febbraro. -Fixed the default plugin fall back for a Bean. febbraro. -Added default no-op tests on unimplemented unit tests. febbraro. -#1541802: Add back bean_all module. -#1538852 by alexweber: Added 'Package" for Bean modules in .info file. -#1535444 by indytechcook: Added permission for block_view() url. -#1535444 by barraponto: Fixed mis type in bean_permission. -#1541968 by alexweber: Fixed Fatal error when uninstalling Bean Admin UI. -#1510508 by mraichelson: Fixed issue with sorting with Workbench integration. -#1510508 by jhedstrom: Fixed access permissions to Workbench. -#1559944 by recidive, skwashd: Added Services support. - - -Bean 7.x-1.0-rc4, 2012-04-18 ----------------------------- -#1510508: Added Integrate with Workbench. -#1503270 by Denes.Szabo|indytechcook: Added Block list displays the filter form - when have not defined a bean type yet. -#1519730 by skwashd: Fixed Plugin @plugin of plugin type bean:@type points to - nonexistent file bean_admin_ui()/BeanCustom.class.php for class handler. -#1537456 by barraponto|indytechcook: Fixed Better titles for - bean/add/%bean-type and bean/edit/%bean-delta. -#1170188 by barraponto, alexweber | mrfelton: Added menu items for Bean Type - edit, delete, manage fields, display fields pages. -#1491956 by recidive: Add UUID/Deploy support. - - -Bean 7.x-1.0-rc3, 2012-03-16 ----------------------------- -Fixed issue with bean type filter at admin/content/blocks. -#1452368 by Denes.Szabo: Fixed Empty description not handled. -#1458298 by tim.cosgrove: Fixed Implementation of Contextual Links for Beans +bean 7.x-1.x-dev +================ +Fixed issue with bean type filter at admin/content/blocks +Issue #1452368 by Denes.Szabo: Fixed Empty description not handled. +Issue #1458298 by tim.cosgrove: Fixed Implementation of Contextual Links for Beans causes block to appear even with content is otherwise empty. -#1376902 by willvincent: Fixed Plugin container of plugin type bean:types points - to nonexistent file. -#1354824 by willvincent | mrfelton: Fixed Unable to add fields to newly created - bean type. -Fix coding standards and use the correct scope in functions. - - -Bean 7.x-1.0-rc2, 2012-03-16 ----------------------------- -DO NOT USE - - -Bean 7.x-1.0-rc1, 2012-02-17 ----------------------------- -Added description to beans. -Improve block/add and admin/structure/block-types by alphabetizing and making - more consistent with node/add -Added Tests. -#1389446 by rogical: Added config link in info file. -#1216572 by duellj: Fixed Block cache not flushed after editing a bean, fixing a - couple of errant block_types (underscore) -#1345966 by brantwynn, indytechcook: Change bean page to use EntityFieldQuery. - - -Bean 7.x-1.0-beta10, 2011-12-30 -------------------------------- -#1288438 by drewish: Fixed Definitive broken admin page, when filter type isn't - set. +Issue #1376902 by willvincent: Fixed Plugin container of plugin type bean:types points to nonexistent file. +Issue #1354824 by willvincent | mrfelton: Fixed Unable to add fields to newly created bean type. +Fix coding standards and use the correct scope in functions + +bean 7.x-1.0-rc1 +================ +Added description to beans +Improve block/add and admin/structure/block-types by alphabetizing and making more consistent with node/add +Added Tests +Issue #1389446 by rogical: Added config link in info file. +Issue #1216572 by duellj: Fixed Block cache not flushed after editing a bean. +fixing a couple of errant block_types (underscore) +Issue #1345966 by brantwynn and indytechcook: Change bean page to use EntityFieldQuery + + +bean 7.x-1.0-beta10 +================ +Issue #1288438 by drewish: Fixed Definitive broken admin page, when filter type isn't set. fixing schema field for delta in bean.info.inc by tim.cosgrove -#1376902 by indytechcook: Fixed Plugin container of plugin type bean:types - points to nonexistent file. -#1371280 by duellj: Fixed New %bean_delta() URL breaks translations. -#1371362 by duellj: Added Provide integration with title.module for - translatable block titles. -#1351694 by indytechcook: Check if bean type class exists when loading bean. -#1387242 by brantwynn, indytechcook: Bean module not aligned with Drupal's - coding standards. -API Change: Changed the name of class name for Drupal Standards. All plugins - will need to be updated: - - bean_plugin renamed to BeanPlugin - - bean_default renamed to BeanDefault - - bean_type_plugin_interface renamed to BeanTypePluginInterface - - bean_custom rename to BeanCustom - - -Bean 7.x-1.0-beta9, 2011-12-02 ------------------------------- -#1359472 by indytechcook: Error while uninstalling bean. -#1356088 by indytechcook: Changed path of block types. -#1355818 by Draknek: Fixed Typo in permission description. -#1344146 by aheimlich: Fixed bean.tpl.php not being used. -Change how beans types classes are loaded. Use the Code Registry rather than - ctools includes - - API CHANGE NOTICE: requires you to have the plugin files in the info file. +Issue #1376902 by indytechcook: Fixed Plugin container of plugin type bean:types points to nonexistent file. +Issue #1371280 by duellj: Fixed New %bean_delta() URL breaks translations. +Issue #1371362 by duellj: Added Provide integration with title.module for translatable block titles. +Issue #1351694 by indytechcook: Check if bean type class exists when loading bean. +Issue #1387242 by brantwynn and indytechcook: Bean module not aligned with Drupal's coding standards. +- API Change: Changed the name of class name for Drupal Standards. All plugins will need to be updated + - bean_plugin renamed to BeanPlugin + - bean_default renamed to BeanDefault + - bean_type_plugin_interface renamed to BeanTypePluginInterface + - bean_custom rename to BeanCustom + + +bean 7.x-1.0-beta9 +================ +Issue #1359472 by indytechcook: Error while uninstalling bean. +Issue #1356088 by indytechcook: Changed path of block types. +Issue #1355818 by Draknek: Fixed Typo in permission description. +Issue #1344146 by aheimlich: Fixed bean.tpl.php not being used. +Change how beans types classes are loaded. Use the Code Registry rather then cto0ls includes + - API CHANGE NOTICE This requires you to have the plugin files in the info file. - You no longer need to specify a "path" in the plugin. - -Bean 7.x-1.0-beta8, 2011-11-16 ------------------------------- -Update to use new entity api methods. Code clean up and minor bug fixes in - delete and redirects. -#1334476: Add form_state to bean form plugin. +bean 7.x-1.0-beta8 +================== +Update to use new entity api methods. Code clean up and minor bug fixes in delete and redirects +#1334476: Add form_state to bean form plugin #1335482 by jasperknops: Fixed No check if delta is unique. -#1340338 by duellj and indytechcook: Fixed Notice if editing bean without access - to change view mode. +#1340338 by duellj and indytechcook: Fixed Notice if editing bean without access to change view mode. #1342360: Fixed creating of new bean object. -Update hook_uninstall to add field_attach_delete_bundle. +Update hook_uninstall to add field_attach_delete_bundle #1332440 by duellj: Fixed Bean default fields in edit form should come first. -#1330868: Reworked loading of entity from DB to avoid issues with loading - plugin. - +#1330868: Reworked loading of entity from DB to avoid issues with loading plugin -Bean 7.x-1.0-beta7, 2011-11-16 ------------------------------- +bean 7.x-1.0-beta7 +================== DO NOT USE THIS RELEASE +bean 7.x-1.0-beta6 +================== +API CHANGE HAS BEEN INTRODUCED. SEE #1323876: Entity API 7.x-1.0-beta11 requires new Entity::view() signature. Change your version numbers in your custom block types. -Bean 7.x-1.0-beta6, 2011-11-01 ------------------------------- -API CHANGE HAS BEEN INTRODUCED. SEE #1323876: Entity API 7.x-1.0-beta11 requires - new Entity::view() signature. Change your version numbers in your custom block - types. -Increment version level. -#1323876 by adamdicarlo: Fixed Entity API 7.x-1.0-beta11 requires new - Entity::view() signature. -#1319918: contextual links missing. - +Increment version level +#1323876 by adamdicarlo: Fixed Entity API 7.x-1.0-beta11 requires new Entity::view() signature. +#1319918: contextual links missing -Bean 7.x-1.0-beta5, 2011-10-23 ------------------------------- -View modes should default to "default" not "full". -#1317016: Add the ability to use different view modes in beans. +bean 7.x-1.0-beta5 +================== +view modes should default to "default" not "full" +#1317016: Add the ability to use different view modes in beans #1316996: Add required fields to the meta data. - -Bean 7.x-1.0-beta4, 2011-10-21 ------------------------------- -#1315582: Fix notice error on install. +bean 7.x-1.0-beta4 +================== +#1315582: Fix notice error on install Updated Documentation and added bean.api.php. -#1309126: Add machine names to beans. -#1309126 by adamdicarlo and indytechcook: Add machine names to Beans to use as - Delta. -#1264686: Adding hook_bean_access() to expose the access decision in - bean_access() to other modules. Also adding a menu access callback for the - Bean add page (block/add). +#1309126: Add machine names to beans +#1309126 by adamdicarlo and indytechcook: Add machine names to Beans to use as Delta +#1264686: Adding hook_bean_access() to expose the access decision in bean_access() to other modules. Also adding a menu access callback for the Bean add page (block/add). #1179420: Unable to install Bean Admin UI from an installation profile. Fixing code formatting. -#1302224 by aroq: Make bean entities translatable by entity_translate module. -#1291274 Parse error: syntax error, unexpected ':' with PHP 5.2. -#1288438 Update filter on bean content page. +#1302224 by aroq: Make bean entities translatable by entity_translate module +#1291274 Parse error: syntax error, unexpected ':' with PHP 5.2 +#1288438 Update filter on bean content page +bean 7.x-1.0-beta3 +================== +Bug fixes include fixing broken access to the bean admin UI -Bean 7.x-1.0-beta3, 2011-09-21 ------------------------------- -Bug fixes include fixing broken access to the bean admin UI. -#1272402: bean_get_all_beans() fails if called more than once. -#1272200 by ultimateboy: Fix permission in bean_admin_ui. +Issue #1272402: bean_get_all_beans() fails if called more than once: bean_get_all_beans() fails if called more than once +Issue #1272200: Permissions in bean_admin_ui by ultimateboy: Fix permission in bean_admin_ui Fix bug caused by caching bean results. - -Bean 7.x-1.0-beta2, 2011-09-07 ------------------------------- +bean 7.x-1.0-beta2 +================== Fix for compatibility with latest version of EntityAPI. +bean 7.x-1.0-beta1 +================== +API Change +The interface BeanTypePluginInterface has changed the validate method to include &$form_state as the second argument. Be sure to change any plugins using the validate method. -Bean 7.x-1.0-beta1, 2011-08-10 ------------------------------- -API Change: The interface BeanTypePluginInterface has changed the validate - method to include &$form_state as the second argument. Be sure to change any - plugins using the validate method. -#1221210: Filters for admin/content/blocks: Add filters to bean listing. -#1239596: Remove the .gitignore file from the repository: Remove .gitignore. -#1221008: Add a MENU_NORMAL_ITEM for the block admin page: Define admin page as - MENU_LOCAL_TASK | MENU_NORMAL_ITEM. -Add form_state to the validate method. +#1221210: Filters for admin/content/blocks: Add filters to bean listing +#1239596: Remove the .gitignore file from the repository: Remove .gitignore +#1221008: Add a MENU_NORMAL_ITEM for the block admin page: Define admin page as MENU_LOCAL_TASK | MENU_NORMAL_ITEM +Add form_state to the validate method Fixing permission string for Manage Block Types page. -Fix some small code style issues. -#1207152: Form level submit handlers not called when bean save button is used - - ensure that form level submit handlers are called when bean save button is - used. -Using block_flush_caches() which triggers _block_rehash() for all themes to - clear related caches when a bean is saved. +Fix some small code style issues +#1207152: Form level submit handlers not called when bean save button is used - ensure that form level submit handlers are called when bean save button is used +Using block_flush_caches() which triggers _block_rehash() for all themes to clear related caches when a bean is saved. Adding a dependency on the block module. Adding check to ensure that the BeanTypePluginInterface interface is loaded. Adding check to verify that the bean plugin class loaded successfully. +bean 7.x-1.0-alpha4 +================== +Added missing features.inc file for exportable support +Remove rougr dsm statement +Issue #1196774: Add bean plugin interface: Add code interface for a cleaner implementation + +bean 7.x-1.0-alpha3 +================== +#1167506: Unable to view newly created bean ensure that beans load correcty on older version of php +#1184498: Improvements to the bean administration page improvements to the bean admin page +#1194004: Bean add form submit handler not called when another module alters the form - manually attach validate and submit handlers to bean add/edit form +#1192822: Add logging on bean creation and updating - Add logging on bean create/edit +#1160056: Make Bean types exportable by mrfelton, fabsor: Make bean types exportable + +bean 7.x-1.0-alpha2 +================== +#1167368: Bean plugins not returned from the cache properly by mrfelton: Bean plugins not returned from the cache properly. Be sure to clear caches after pulling this code +#1167506: Unable to view newly created bean, #1167552: Undefined index: alumni_header in bean_fetch_plugin_info() bean.module line 200: Cache and static caching resetting issues +#1173634: Add contextual 'Edit' link for beans add contextual links by mrfelton +#1171200: Deleting Bean Leaves Records in Block Table Delete Bean bugs +#1172884: Missing permissions make it impossible for anonymous users to view Beans by mrfelton Fixed incorrect name of hook_permission + +bean 7.x-1.0-alpha1 +================== +Initial Release -Bean 7.x-1.0-alpha4, 2011-06-22 -------------------------------- -Added missing features.inc file for exportable support. -Remove rougr dsm statement. -#1196774: Add bean plugin interface: Add code interface for a cleaner - implementation. - - -Bean 7.x-1.0-alpha3, 2011-06-22 -------------------------------- -#1167506: Unable to view newly created bean ensure that beans load correcty on - older version of php. -#1184498: Improvements to the bean administration page improvements to the bean - admin page. -#1194004: Bean add form submit handler not called when another module alters the - form - manually attach validate and submit handlers to bean add/edit form. -#1192822: Add logging on bean creation and updating - Add logging on bean - create/edit. -#1160056: Make Bean types exportable by mrfelton, fabsor: Make bean types - exportable. - - -Bean 7.x-1.0-alpha2, 2011-06-16 -------------------------------- -#1167368: Bean plugins not returned from the cache properly by mrfelton: Bean - plugins not returned from the cache properly. Be sure to clear caches after - pulling this code. -#1167506: Unable to view newly created bean, #1167552: Undefined index: - alumni_header in bean_fetch_plugin_info() bean.module line 200: Cache and - static caching resetting issues. -#1173634: Add contextual 'Edit' link for beans add contextual links by mrfelton. -#1171200: Deleting Bean Leaves Records in Block Table Delete Bean bugs. -#1172884: Missing permissions make it impossible for anonymous users to view - Beans by mrfelton Fixed incorrect name of hook_permission. - - -Bean 7.x-1.0-alpha1, 2011-05-20 -------------------------------- -Initial release. diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/bean-usage_context_core-2545018-2.patch b/bean-usage_context_core-2545018-2.patch new file mode 100644 index 0000000..6641984 --- /dev/null +++ b/bean-usage_context_core-2545018-2.patch @@ -0,0 +1,825 @@ +diff --git a/CHANGELOG.txt b/CHANGELOG.txt +index 462d0b0..720904e 100644 +--- a/CHANGELOG.txt ++++ b/CHANGELOG.txt +@@ -1,403 +1,146 @@ +-Current API VERSION: 5. ++Current API VERSION: 4. + +-Bean 7.x-1.8, 2014-10-02 +---------------------------- +-#2175309 by jeffam: Added Block add/edit pages can still use site theme when an admin theme is enabled. +-#2148923 by codeamatic, nielsdefeyter, lahode: Fixed Unable to translate bean blocks. +-#2201503 by jlyon, sherakama | ibotvinn: Fixed Block cache not flushed after editing a bean. +-#2337555 by catch: Add static caching to bean_load_delta(). +- +-Bean 7.x-1.7, 2013-11-29 +---------------------------- +-#2145333 by chris.jichen: Fixed misspelling of entity_access in views plugin +- +-Bean 7.x-1.6, 2013-11-20 +---------------------------- +-#2138651 by indytechcook: Add deploy_managed_ui_form_elements() to edit/create form. +-#1941168: Add back in missing setDefault method on bean class. +-#1957986 by sylus: Bean + UUID / Deploy. +-#2112567 by webflo: Make access controller swappable. +-#2115463 by webflo: Page title is escaped twice. +-#1684250 by rimen, foopang: Transliteration module integration fix. +-#2117223 by jrbeeman: Static cache bean_block_info(). +-#2123053 by dagmar: Uninstalling Bean when Shortcut module is disabled produces a fatal error. +-#2114279 by kingandy: Block cache flush introduces Block module dependency. +- +-Bean 7.x-1.5, 2013-10-23 +---------------------------- +-by DamienMcKenna: Fixed arbitrary tag in the bean title input. +- +-Bean 7.x-1.4, 2013-10-13 +---------------------------- +-#2080239 by ro0NL: Bean export type is internally translated +-#2061725 by timaholt: support UUID for revisions +-#2076133 by Sylvain Lecoy: Align admin/structure text with drupal standards +-#1359472 by arithmetric: Fix uninstall of bean module plugins +-#2053911 by franz: When no Bean type is created, views_handler_filter_bean_type +- return many errors. +-#2095595 by SpadXIII: Fixed Revision stores wrong uid. +-#1891210 by valderama, guillaumev: Fixed Incompatible with entity reference +- formatter Rendered Entity. +-#1891928 by jeffam | indytechcook: Fixed Block reference not picking up bean +- module blocks. +-#2108631 by webflo: Fixed Add access checks to default Bean Admin UI. +- +-Bean 7.x-1.3, 2013-07-24 +----------------------------- +-#2036137 by eugene.ilyin: Fixed Numeric delta of the bean block. +- Followup by brantwynn Fix block delta truncation error. +-#1728632 by donutdan4114 | indytechcook: Fixed Can't name a bean type 'bean'. +-#1982468 by 30equals: Cleanup menulink/shortcut after uninstall +- +-Bean 7.x-1.2, 2013-05-12 +----------------------------- +-#1924126 by DamienMcKenna: Group beans by block type in the CTools/Panels content +-type (sic) plugin +-#1978808 by k.minkov: Assign bean object to form on insert +-#1990112 by rodrigo panchiniak fernandes: Minor Typo at README.txt +-#1961464 by jamsilver: Extra fields needed for label, revision and view_mode +-form elements. +-#1973696 by pcambra: Fix bean.api.php to set path and file in the class level. +-#1935770 by rooby: Beans without a title should not fallback to showing the +-admin label but instead show no title at all +-#1957260 by DamienMcKenna: There is no $langcode argument for +- field_attach_form_validate(). +-#1935466 by jeffam, DamienMcKenna: Improve integration with Admin Menu module. +-#1934294 by darthsteven: Entity Cache Support. +-#1906958 by ytsurk, Albert Volkman, miro_dietiker: Added Switch admin +- bean/block list to views. +-#1935770 by rooby: fixed erronous block titles showing up as labels. +-#1179420 by mrfelton: Unable to install Bean plugins from an installation +- profile, switched to ctools style plugin naming. +-#1941168 by DamienMcKenna, Albert Volkman: Fixed the 'set active' URL. +-#1911224 by DamienMcKenna: Reverted support for references_dialog, that module +- already added support for Bean. +- +- +-Bean 7.x-1.1, 2013-02-27 +------------------------- +-#1911224 by DamienMcKenna: Added Support for references_dialog(). +-#1910566 by Bès: Added Use label of view mode in bean add and edit form. +-#1912444 by John Bickar: Fixed Fatal Error: Call to undefined function +- entity_language(). +-#1354824 by DamienMcKenna, willvincent | mrfelton: Fixed Unable to add fields to +- newly created bean type. +-#1918188 by eugene.ilyin: Added Few useful views handlers for work with bean +- blocks. +-#1916938: Fixed Empty block name in entity reference field. +-#1924006 by DamienMcKenna: Added Convert bean URL to lowercase. +-#1920296 by fubhy | indytechcook: Fixed Can't delete revisions. +- +- +-Bean 7.x-1.0, 2013-02-01 +------------------------- +-#1850948 by indytechcook: Fixed Bean revision fields are not accessible in +- EntityFieldQuery. +- +- +-Bean 7.x-1.0-rc10, 2013-02-01 +------------------------------ +-Make sure bean_reset rebuilds the menu correctly. +-Fix issue in install of shortcuts. +-#1691482: Moved contextual links back to bean_view and check that return of +- plugin is a render array +-#1891532: Remove check_plain from bean entity class +-#1897834 Fixed Bean, Features and permissions. +-#1900104: Fixed Error when disabling bean. +-#1892272 by stijndm: Fixed Unable to edit exported bean types due to form API +- syntax error. +- +- +-Bean 7.x-1.0-rc9, 2013-01-21 +----------------------------- +-#1885958 by Steven Jones: Added EntityMetadataWrapper sets not working. +-#1893950: Fixed Ctools warnings in log. +-Move check_plain into the entity class. +-#1887778 by Deciphered: Fixed Incorrect operations colspan. +-#1891358 by DamienMcKenna: Fixed Data loss if both 'Create new revision" and +- "Set Revision as default" options unchecked. +-#1886002 by DamienMcKenna | paulhhowells: Fixed Administer Bean Settings x2. +-#1889892 Fixed bean_reset() calls menu_rebuild(), which already happens during +- drupal_flush_all_caches(). +- +- +-Bean 7.x-1.0-rc8, 2013-01-10 +----------------------------- +-Remove batches and use correct cache clear function. +-#1883232 by Steven Jones: Fixed Bean EntityMetadataWrapper integration broken. +-Fix bean unit test. +-#1885238 by indytechcook: Fixed xss bean type label not escaped sufficiently. +- +- +-Bean 7.x-1.0-rc7, 2012-12-31 +----------------------------- +-#1828096 by Brandonian: Fixed bean_update_7007 does not work with real-world +- data. +-#1691482 by Brandonian | mrfelton: Fixed contextual links not working. +-#1601960 by indytechcook Fixed [bean_all()] Endless recursion in combination +- with Views. +-#1611676 by barraponto | hazah: Added Views filter by bean type. +-#1799776 by bforchhammer: Fixed entity translation regressions. +-#1710256 by jonhattan, indytechcook: Fixed «Delete block type» button +- misplaced. +-#1785950 by jonhattan | indytechcook: Fixed Revert and delete should be separate +- operations. +-#1786036 by jonhattan | indytechcook: Fixed Caches not completely cleared. +-Integrate Bean Revisions +-#1814068 by jonhattan: Remove leftover patch files in repo. +-#1833176 by darrenmothersele: Fixed List Shortcut module as a dependency or +- remove from bean_install(). +-#1836798 by bhauff: Block Label used rather than Title on block/delta and +- block/delta/view. +-#1844538 by mrfelton: Fixed Field data missing when editing language neutral +- beans. +-#1839966 by ultimateboy: Fixed block/add doesn't check for access before +- generating list. +-#1838088 by jamesharv: Fixed Adding bean type and permissions to existing +- features module can cause drush cache clear to fail. +-#1845974 by indytechcook: Fixed Block Admin label is correct. +-#1793586 by Mixologic | indytechcook: Fixed Editing Bean Content Does not +- Trigger Page Cache Clear. +-#1870730 by jm.federico: Fixed bean_view() changes the current page title. +-#1859450 by jonhattan: Drop dependency on block.module. +- +- +-Bean 7.x-1.0-rc6, 2012-09-05 +----------------------------- +-#1649312: Bean Usage sub-module. +-#1691458 by mrfelton: Fixed Unable to access bean overview page unless +- administer bean permissions is granted. +-#1698548 by rsaddington: Fixed Block types tables has too many td's. +-#1534722 by broeker, skwashd | tanc: Added Make custom bean forms compatible +- with Display Suite. +-#1684250 by rimen|indytechcook: Transliteration module integration. +-#1663264 by brantwynn: Fixed Status Message Text is wrong during Bean Create and +- Update. +-#1717540 by jonhattan: Fixed [bean_all()] Fatal error when creating a block +- instance. +-#1751268 by skwashd: Added Support Services API v3002. +-#1770190 by bforchhammer: Fixed entity translation integration. +-#1535444 by indytechcook: Fixed display of permission description. +- +- +-Bean 7.x-1.0-rc5, 2012-06-03 +----------------------------- +-Fixed unit testing issues with Bean permissions. febbraro. +-Fixed the default plugin fall back for a Bean. febbraro. +-Added default no-op tests on unimplemented unit tests. febbraro. +-#1541802: Add back bean_all module. +-#1538852 by alexweber: Added 'Package" for Bean modules in .info file. +-#1535444 by indytechcook: Added permission for block_view() url. +-#1535444 by barraponto: Fixed mis type in bean_permission. +-#1541968 by alexweber: Fixed Fatal error when uninstalling Bean Admin UI. +-#1510508 by mraichelson: Fixed issue with sorting with Workbench integration. +-#1510508 by jhedstrom: Fixed access permissions to Workbench. +-#1559944 by recidive, skwashd: Added Services support. +- +- +-Bean 7.x-1.0-rc4, 2012-04-18 +----------------------------- +-#1510508: Added Integrate with Workbench. +-#1503270 by Denes.Szabo|indytechcook: Added Block list displays the filter form +- when have not defined a bean type yet. +-#1519730 by skwashd: Fixed Plugin @plugin of plugin type bean:@type points to +- nonexistent file bean_admin_ui()/BeanCustom.class.php for class handler. +-#1537456 by barraponto|indytechcook: Fixed Better titles for +- bean/add/%bean-type and bean/edit/%bean-delta. +-#1170188 by barraponto, alexweber | mrfelton: Added menu items for Bean Type +- edit, delete, manage fields, display fields pages. +-#1491956 by recidive: Add UUID/Deploy support. +- +- +-Bean 7.x-1.0-rc3, 2012-03-16 +----------------------------- +-Fixed issue with bean type filter at admin/content/blocks. +-#1452368 by Denes.Szabo: Fixed Empty description not handled. +-#1458298 by tim.cosgrove: Fixed Implementation of Contextual Links for Beans ++bean 7.x-1.x-dev ++================ ++Fixed issue with bean type filter at admin/content/blocks ++Issue #1452368 by Denes.Szabo: Fixed Empty description not handled. ++Issue #1458298 by tim.cosgrove: Fixed Implementation of Contextual Links for Beans + causes block to appear even with content is otherwise empty. +-#1376902 by willvincent: Fixed Plugin container of plugin type bean:types points +- to nonexistent file. +-#1354824 by willvincent | mrfelton: Fixed Unable to add fields to newly created +- bean type. +-Fix coding standards and use the correct scope in functions. +- +- +-Bean 7.x-1.0-rc2, 2012-03-16 +----------------------------- +-DO NOT USE +- +- +-Bean 7.x-1.0-rc1, 2012-02-17 +----------------------------- +-Added description to beans. +-Improve block/add and admin/structure/block-types by alphabetizing and making +- more consistent with node/add +-Added Tests. +-#1389446 by rogical: Added config link in info file. +-#1216572 by duellj: Fixed Block cache not flushed after editing a bean, fixing a +- couple of errant block_types (underscore) +-#1345966 by brantwynn, indytechcook: Change bean page to use EntityFieldQuery. +- +- +-Bean 7.x-1.0-beta10, 2011-12-30 +-------------------------------- +-#1288438 by drewish: Fixed Definitive broken admin page, when filter type isn't +- set. ++Issue #1376902 by willvincent: Fixed Plugin container of plugin type bean:types points to nonexistent file. ++Issue #1354824 by willvincent | mrfelton: Fixed Unable to add fields to newly created bean type. ++Fix coding standards and use the correct scope in functions ++ ++bean 7.x-1.0-rc1 ++================ ++Added description to beans ++Improve block/add and admin/structure/block-types by alphabetizing and making more consistent with node/add ++Added Tests ++Issue #1389446 by rogical: Added config link in info file. ++Issue #1216572 by duellj: Fixed Block cache not flushed after editing a bean. ++fixing a couple of errant block_types (underscore) ++Issue #1345966 by brantwynn and indytechcook: Change bean page to use EntityFieldQuery ++ ++ ++bean 7.x-1.0-beta10 ++================ ++Issue #1288438 by drewish: Fixed Definitive broken admin page, when filter type isn't set. + fixing schema field for delta in bean.info.inc by tim.cosgrove +-#1376902 by indytechcook: Fixed Plugin container of plugin type bean:types +- points to nonexistent file. +-#1371280 by duellj: Fixed New %bean_delta() URL breaks translations. +-#1371362 by duellj: Added Provide integration with title.module for +- translatable block titles. +-#1351694 by indytechcook: Check if bean type class exists when loading bean. +-#1387242 by brantwynn, indytechcook: Bean module not aligned with Drupal's +- coding standards. +-API Change: Changed the name of class name for Drupal Standards. All plugins +- will need to be updated: +- - bean_plugin renamed to BeanPlugin +- - bean_default renamed to BeanDefault +- - bean_type_plugin_interface renamed to BeanTypePluginInterface +- - bean_custom rename to BeanCustom +- +- +-Bean 7.x-1.0-beta9, 2011-12-02 +------------------------------- +-#1359472 by indytechcook: Error while uninstalling bean. +-#1356088 by indytechcook: Changed path of block types. +-#1355818 by Draknek: Fixed Typo in permission description. +-#1344146 by aheimlich: Fixed bean.tpl.php not being used. +-Change how beans types classes are loaded. Use the Code Registry rather than +- ctools includes +- - API CHANGE NOTICE: requires you to have the plugin files in the info file. ++Issue #1376902 by indytechcook: Fixed Plugin container of plugin type bean:types points to nonexistent file. ++Issue #1371280 by duellj: Fixed New %bean_delta() URL breaks translations. ++Issue #1371362 by duellj: Added Provide integration with title.module for translatable block titles. ++Issue #1351694 by indytechcook: Check if bean type class exists when loading bean. ++Issue #1387242 by brantwynn and indytechcook: Bean module not aligned with Drupal's coding standards. ++- API Change: Changed the name of class name for Drupal Standards. All plugins will need to be updated ++ - bean_plugin renamed to BeanPlugin ++ - bean_default renamed to BeanDefault ++ - bean_type_plugin_interface renamed to BeanTypePluginInterface ++ - bean_custom rename to BeanCustom ++ ++ ++bean 7.x-1.0-beta9 ++================ ++Issue #1359472 by indytechcook: Error while uninstalling bean. ++Issue #1356088 by indytechcook: Changed path of block types. ++Issue #1355818 by Draknek: Fixed Typo in permission description. ++Issue #1344146 by aheimlich: Fixed bean.tpl.php not being used. ++Change how beans types classes are loaded. Use the Code Registry rather then cto0ls includes ++ - API CHANGE NOTICE This requires you to have the plugin files in the info file. + - You no longer need to specify a "path" in the plugin. + +- +-Bean 7.x-1.0-beta8, 2011-11-16 +------------------------------- +-Update to use new entity api methods. Code clean up and minor bug fixes in +- delete and redirects. +-#1334476: Add form_state to bean form plugin. ++bean 7.x-1.0-beta8 ++================== ++Update to use new entity api methods. Code clean up and minor bug fixes in delete and redirects ++#1334476: Add form_state to bean form plugin + #1335482 by jasperknops: Fixed No check if delta is unique. +-#1340338 by duellj and indytechcook: Fixed Notice if editing bean without access +- to change view mode. ++#1340338 by duellj and indytechcook: Fixed Notice if editing bean without access to change view mode. + #1342360: Fixed creating of new bean object. +-Update hook_uninstall to add field_attach_delete_bundle. ++Update hook_uninstall to add field_attach_delete_bundle + #1332440 by duellj: Fixed Bean default fields in edit form should come first. +-#1330868: Reworked loading of entity from DB to avoid issues with loading +- plugin. +- ++#1330868: Reworked loading of entity from DB to avoid issues with loading plugin + +-Bean 7.x-1.0-beta7, 2011-11-16 +------------------------------- ++bean 7.x-1.0-beta7 ++================== + DO NOT USE THIS RELEASE + ++bean 7.x-1.0-beta6 ++================== ++API CHANGE HAS BEEN INTRODUCED. SEE #1323876: Entity API 7.x-1.0-beta11 requires new Entity::view() signature. Change your version numbers in your custom block types. + +-Bean 7.x-1.0-beta6, 2011-11-01 +------------------------------- +-API CHANGE HAS BEEN INTRODUCED. SEE #1323876: Entity API 7.x-1.0-beta11 requires +- new Entity::view() signature. Change your version numbers in your custom block +- types. +-Increment version level. +-#1323876 by adamdicarlo: Fixed Entity API 7.x-1.0-beta11 requires new +- Entity::view() signature. +-#1319918: contextual links missing. +- ++Increment version level ++#1323876 by adamdicarlo: Fixed Entity API 7.x-1.0-beta11 requires new Entity::view() signature. ++#1319918: contextual links missing + +-Bean 7.x-1.0-beta5, 2011-10-23 +------------------------------- +-View modes should default to "default" not "full". +-#1317016: Add the ability to use different view modes in beans. ++bean 7.x-1.0-beta5 ++================== ++view modes should default to "default" not "full" ++#1317016: Add the ability to use different view modes in beans + #1316996: Add required fields to the meta data. + +- +-Bean 7.x-1.0-beta4, 2011-10-21 +------------------------------- +-#1315582: Fix notice error on install. ++bean 7.x-1.0-beta4 ++================== ++#1315582: Fix notice error on install + Updated Documentation and added bean.api.php. +-#1309126: Add machine names to beans. +-#1309126 by adamdicarlo and indytechcook: Add machine names to Beans to use as +- Delta. +-#1264686: Adding hook_bean_access() to expose the access decision in +- bean_access() to other modules. Also adding a menu access callback for the +- Bean add page (block/add). ++#1309126: Add machine names to beans ++#1309126 by adamdicarlo and indytechcook: Add machine names to Beans to use as Delta ++#1264686: Adding hook_bean_access() to expose the access decision in bean_access() to other modules. Also adding a menu access callback for the Bean add page (block/add). + #1179420: Unable to install Bean Admin UI from an installation profile. + Fixing code formatting. +-#1302224 by aroq: Make bean entities translatable by entity_translate module. +-#1291274 Parse error: syntax error, unexpected ':' with PHP 5.2. +-#1288438 Update filter on bean content page. ++#1302224 by aroq: Make bean entities translatable by entity_translate module ++#1291274 Parse error: syntax error, unexpected ':' with PHP 5.2 ++#1288438 Update filter on bean content page + ++bean 7.x-1.0-beta3 ++================== ++Bug fixes include fixing broken access to the bean admin UI + +-Bean 7.x-1.0-beta3, 2011-09-21 +------------------------------- +-Bug fixes include fixing broken access to the bean admin UI. +-#1272402: bean_get_all_beans() fails if called more than once. +-#1272200 by ultimateboy: Fix permission in bean_admin_ui. ++Issue #1272402: bean_get_all_beans() fails if called more than once: bean_get_all_beans() fails if called more than once ++Issue #1272200: Permissions in bean_admin_ui by ultimateboy: Fix permission in bean_admin_ui + Fix bug caused by caching bean results. + +- +-Bean 7.x-1.0-beta2, 2011-09-07 +------------------------------- ++bean 7.x-1.0-beta2 ++================== + Fix for compatibility with latest version of EntityAPI. + ++bean 7.x-1.0-beta1 ++================== ++API Change ++The interface BeanTypePluginInterface has changed the validate method to include &$form_state as the second argument. Be sure to change any plugins using the validate method. + +-Bean 7.x-1.0-beta1, 2011-08-10 +------------------------------- +-API Change: The interface BeanTypePluginInterface has changed the validate +- method to include &$form_state as the second argument. Be sure to change any +- plugins using the validate method. +-#1221210: Filters for admin/content/blocks: Add filters to bean listing. +-#1239596: Remove the .gitignore file from the repository: Remove .gitignore. +-#1221008: Add a MENU_NORMAL_ITEM for the block admin page: Define admin page as +- MENU_LOCAL_TASK | MENU_NORMAL_ITEM. +-Add form_state to the validate method. ++#1221210: Filters for admin/content/blocks: Add filters to bean listing ++#1239596: Remove the .gitignore file from the repository: Remove .gitignore ++#1221008: Add a MENU_NORMAL_ITEM for the block admin page: Define admin page as MENU_LOCAL_TASK | MENU_NORMAL_ITEM ++Add form_state to the validate method + Fixing permission string for Manage Block Types page. +-Fix some small code style issues. +-#1207152: Form level submit handlers not called when bean save button is used - +- ensure that form level submit handlers are called when bean save button is +- used. +-Using block_flush_caches() which triggers _block_rehash() for all themes to +- clear related caches when a bean is saved. ++Fix some small code style issues ++#1207152: Form level submit handlers not called when bean save button is used - ensure that form level submit handlers are called when bean save button is used ++Using block_flush_caches() which triggers _block_rehash() for all themes to clear related caches when a bean is saved. + Adding a dependency on the block module. + Adding check to ensure that the BeanTypePluginInterface interface is loaded. + Adding check to verify that the bean plugin class loaded successfully. + ++bean 7.x-1.0-alpha4 ++================== ++Added missing features.inc file for exportable support ++Remove rougr dsm statement ++Issue #1196774: Add bean plugin interface: Add code interface for a cleaner implementation ++ ++bean 7.x-1.0-alpha3 ++================== ++#1167506: Unable to view newly created bean ensure that beans load correcty on older version of php ++#1184498: Improvements to the bean administration page improvements to the bean admin page ++#1194004: Bean add form submit handler not called when another module alters the form - manually attach validate and submit handlers to bean add/edit form ++#1192822: Add logging on bean creation and updating - Add logging on bean create/edit ++#1160056: Make Bean types exportable by mrfelton, fabsor: Make bean types exportable ++ ++bean 7.x-1.0-alpha2 ++================== ++#1167368: Bean plugins not returned from the cache properly by mrfelton: Bean plugins not returned from the cache properly. Be sure to clear caches after pulling this code ++#1167506: Unable to view newly created bean, #1167552: Undefined index: alumni_header in bean_fetch_plugin_info() bean.module line 200: Cache and static caching resetting issues ++#1173634: Add contextual 'Edit' link for beans add contextual links by mrfelton ++#1171200: Deleting Bean Leaves Records in Block Table Delete Bean bugs ++#1172884: Missing permissions make it impossible for anonymous users to view Beans by mrfelton Fixed incorrect name of hook_permission ++ ++bean 7.x-1.0-alpha1 ++================== ++Initial Release + +-Bean 7.x-1.0-alpha4, 2011-06-22 +-------------------------------- +-Added missing features.inc file for exportable support. +-Remove rougr dsm statement. +-#1196774: Add bean plugin interface: Add code interface for a cleaner +- implementation. +- +- +-Bean 7.x-1.0-alpha3, 2011-06-22 +-------------------------------- +-#1167506: Unable to view newly created bean ensure that beans load correcty on +- older version of php. +-#1184498: Improvements to the bean administration page improvements to the bean +- admin page. +-#1194004: Bean add form submit handler not called when another module alters the +- form - manually attach validate and submit handlers to bean add/edit form. +-#1192822: Add logging on bean creation and updating - Add logging on bean +- create/edit. +-#1160056: Make Bean types exportable by mrfelton, fabsor: Make bean types +- exportable. +- +- +-Bean 7.x-1.0-alpha2, 2011-06-16 +-------------------------------- +-#1167368: Bean plugins not returned from the cache properly by mrfelton: Bean +- plugins not returned from the cache properly. Be sure to clear caches after +- pulling this code. +-#1167506: Unable to view newly created bean, #1167552: Undefined index: +- alumni_header in bean_fetch_plugin_info() bean.module line 200: Cache and +- static caching resetting issues. +-#1173634: Add contextual 'Edit' link for beans add contextual links by mrfelton. +-#1171200: Deleting Bean Leaves Records in Block Table Delete Bean bugs. +-#1172884: Missing permissions make it impossible for anonymous users to view +- Beans by mrfelton Fixed incorrect name of hook_permission. +- +- +-Bean 7.x-1.0-alpha1, 2011-05-20 +-------------------------------- +-Initial release. +diff --git a/LICENSE.txt b/LICENSE.txt +new file mode 100644 +index 0000000..d159169 +--- /dev/null ++++ b/LICENSE.txt +@@ -0,0 +1,339 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Lesser General Public License instead.) You can apply it to ++your programs, too. ++ ++ When we speak of free software, we are referring to freedom, not ++price. Our General Public Licenses are designed to make sure that you ++have the freedom to distribute copies of free software (and charge for ++this service if you wish), that you receive source code or can get it ++if you want it, that you can change the software or use pieces of it ++in new free programs; and that you know you can do these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. You must make sure that they, too, receive or can get the ++source code. And you must show them these terms so they know their ++rights. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute verbatim copies of the Program's ++source code as you receive it, in any medium, provided that you ++conspicuously and appropriately publish on each copy an appropriate ++copyright notice and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the General Public License from time to time. Such new versions will ++be similar in spirit to the present version, but may differ in detail to ++address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Program ++specifies a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY ++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES ++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED ++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE ++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, ++REPAIR OR CORRECTION. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED ++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY ++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER ++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE ++POSSIBILITY OF SUCH DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs ++ ++ If you develop a new program, and you want it to be of the greatest ++possible use to the public, the best way to achieve this is to make it ++free software which everyone can redistribute and change under these terms. ++ ++ To do so, attach the following notices to the program. It is safest ++to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ \ No newline at end of file diff --git a/bean.info b/bean.info index 51048e9..5783a88 100644 --- a/bean.info +++ b/bean.info @@ -6,6 +6,7 @@ files[] = includes/bean.info.inc files[] = plugins/BeanPlugin.class.php files[] = plugins/BeanDefault.class.php files[] = includes/translation.handler.bean.inc +files[] = includes/bean.inline_entity_form.inc files[] = views/views_handler_filter_bean_type.inc files[] = views/views_handler_field_bean_type.inc files[] = views/views_handler_field_bean_edit_link.inc @@ -15,3 +16,5 @@ files[] = bean.test dependencies[] = entity (>=7.x-1.0) dependencies[] = ctools package = Bean + + diff --git a/bean.module b/bean.module index cd522f7..d26e903 100644 --- a/bean.module +++ b/bean.module @@ -14,6 +14,10 @@ function bean_entity_info() { 'label' => t('Block'), 'entity class' => 'Bean', 'controller class' => 'BeanEntityAPIController', + // This class provides integration with the Inline entity form module. + 'inline entity form' => array( + 'controller' => 'BeanInlineEntityFormController', + ), 'base table' => 'bean', 'revision table' => 'bean_revision', 'fieldable' => TRUE, diff --git a/bean_admin_ui/bean_admin_ui.info b/bean_admin_ui/bean_admin_ui.info index fb2bd8e..2ba3f31 100644 --- a/bean_admin_ui/bean_admin_ui.info +++ b/bean_admin_ui/bean_admin_ui.info @@ -6,3 +6,10 @@ dependencies[] = bean files[] = plugins/BeanCustom.class.php configure = admin/structure/block-types package = Bean + +; Information added by Drupal.org packaging script on 2015-03-04 +version = "7.x-1.9" +core = "7.x" +project = "bean" +datestamp = "1425439382" + diff --git a/bean_admin_ui/plugins/custom.inc b/bean_admin_ui/plugins/custom.inc new file mode 100644 index 0000000..4af6294 --- /dev/null +++ b/bean_admin_ui/plugins/custom.inc @@ -0,0 +1,71 @@ +getExportStatus() == 'Normal') { + db_delete('bean') + ->condition('type', $this->type) + ->execute(); + } + db_delete('bean_type') + ->condition('name', $this->type) + ->execute(); + field_attach_delete_bundle('bean', $this->type); + drupal_flush_all_caches(); + } + + /** + * Save the record to the database + */ + public function save($new = FALSE) { + $bean_type = array( + 'name' => $this->type, + 'label' => $this->getLabel(), + 'description' => $this->getDescription(), + ); + + $primary_key = $new == FALSE ? 'name' : array(); + drupal_write_record('bean_type', $bean_type, $primary_key); + drupal_static_reset('bean_admin_ui_get_types'); + + bean_reset(); + } + + /** + * Get the export status + */ + public function getExportStatus() { + return $this->plugin_info['export_status']; + } + + /** + * Set the label. + * + * @param label + */ + public function setLabel($label) { + $this->plugin_info['label'] = $label; + } + + /** + * Set the description. + * + * @param description + */ + public function setDescription($description) { + $this->plugin_info['description'] = $description; + } +} diff --git a/bean_entitycache/bean_entitycache.info b/bean_entitycache/bean_entitycache.info index 2fdffc9..f50fdc6 100644 --- a/bean_entitycache/bean_entitycache.info +++ b/bean_entitycache/bean_entitycache.info @@ -8,3 +8,10 @@ files[] = includes/bean_entitycache.core.inc dependencies[] = bean dependencies[] = entitycache + +; Information added by Drupal.org packaging script on 2015-03-04 +version = "7.x-1.9" +core = "7.x" +project = "bean" +datestamp = "1425439382" + diff --git a/bean_usage/README.TXT b/bean_usage/README.TXT new file mode 100644 index 0000000..c4f9473 --- /dev/null +++ b/bean_usage/README.TXT @@ -0,0 +1,43 @@ +Bean Usage +================================== + +Enable this module to get reports of where a bean is being used on your site. It currently integrates with +Drupal Core block placement, the Context module, and the Block Reference module. + +In order to access any bean usage reports, the current user must have the permission of "View bean usage". + +To access a report of all beans, go to admin/reports/bean/usage. Currently this report only looks at block references. + +Individual bean usage reports may be accessed by clicking on the "Usage" tab when viewing/editing a bean. + +================================== +Configuration +================================== + +Configuration of the reports may be accomplished at admin/reports/bean/usage/settings. + +You may enable or disable, as necessary, integrations with Block Reference, Contexts, or Core at this form. If +the Block Reference module or Context module is not installed, then the respective check box will not be displayed. + +If using the block reference field, you may also enable the "Include Revisioned Fields" check box. This will +inspect an Entity's revisions to see if the bean was used in other revisions. This is useful if you have revisioning +workflows as part of your content strategy. Usage in revisions other than the current one is reported only on +an individual bean usage report, it is not included in the site-wide report. + +================================== +Permissions +================================== + +The module enables the following permissions: +* View bean usage: Enables the usage reports (site-wide and individual) +* Administer bean usage: Access to the report's configuration page described in the "Configuration" section. +* Always Show Core Usage: This may be useful if your site editors need to know where a bean is being used but do not + have control over where it is placed. This will show it in the individual usage report even if the user does not + have permission to use the core block placement (admin/structure/block). If a user does not this permission and does + not have permission to use the core block placement, then no data will be shown. +* Always Show Context Usage: This may be useful if your site editors need to know where a bean is being used but do not + have control over where it is placed using the Context UI module. This will show it in the individual usage report even + if the user does not have permission to use the Context UI module. If a user does not this permission and does + not have permission to use the Context UI, then no data will be shown. (NOTE: If the context module is not installed, + then this permission will not be displayed.) + diff --git a/bean_usage/bean_usage.info b/bean_usage/bean_usage.info index 1b8b6ce..fd59a21 100644 --- a/bean_usage/bean_usage.info +++ b/bean_usage/bean_usage.info @@ -4,3 +4,10 @@ core = 7.x dependencies[] = bean dependencies[] = blockreference package = Bean + +; Information added by Drupal.org packaging script on 2015-03-04 +version = "7.x-1.9" +core = "7.x" +project = "bean" +datestamp = "1425439382" + diff --git a/bean_usage/bean_usage.module b/bean_usage/bean_usage.module index 6042046..3e7cb69 100644 --- a/bean_usage/bean_usage.module +++ b/bean_usage/bean_usage.module @@ -29,7 +29,7 @@ function bean_usage_menu() { // bean usage report $items['admin/reports/bean/usage'] = array( 'title' => t('Bean usage'), - 'description' => 'Displays a list of Beans (blockreferences) and where they are used.', + 'description' => 'Displays a list of Beans and where they are used.', 'page callback' => 'bean_usage_output', 'page arguments' => array(4), 'access arguments' => array('view bean usage'), @@ -37,7 +37,7 @@ function bean_usage_menu() { $items['admin/reports/bean/usage/list'] = array( 'title' => t('Usage'), - 'description' => 'Displays a list of Beans (blockreferences) and where they are used.', + 'description' => 'Displays a list of Beans and where they are used.', 'weight' => 0, 'page callback' => 'bean_usage_output', 'page arguments' => array(5), @@ -47,7 +47,7 @@ function bean_usage_menu() { $items['admin/reports/bean/usage/settings'] = array( 'title' => t('Settings'), - 'description' => t('Displays a list of Beans (blockreferences) and where they are used.'), + 'description' => t('Displays a list of Beans and where they are used.'), 'weight' => 1, 'page callback' => 'drupal_get_form', 'page arguments' => array('bean_usage_settings'), @@ -68,14 +68,27 @@ function bean_usage_permission() { $perms = array( 'view bean usage' => array( 'title' => t('View bean usage'), - 'description' => t('View a list of Beans (blockreferences) and where they are used.'), + 'description' => t('View a list of Beans and where they are used.'), ), 'administer bean usage' => array( 'title' => t('Administer bean usage'), 'description' => t('Administer settings for the bean usage page.'), ), + 'always show core' => array( + 'title' => t('Always show core usage'), + 'description' => t('Always show the Drupal Core block placement usage for the bean even if the user does not have block administration rights.'), + ), ); + + if (module_exists("context")) { + $perms['always show context'] = array( + 'title' => t('Always show context usage'), + 'description' => t('Always show the context usage for the bean even if the user does not have context administration rights.'), + ); + } + return $perms; + } /** @@ -95,6 +108,11 @@ function bean_usage_output($bean = NULL) { $delta_specific = $delta_found = FALSE; $bean_usage_form = drupal_get_form('bean_usage_filters'); + // This variable is used when it's just one bean being displayed + // and will hold the db query so that extra results can be displayed + // later. + $delta_specific_db_result = NULL; + if (!empty($bean) && is_object($bean)) { $delta_specific = TRUE; } else if (is_numeric($bean)) { @@ -133,8 +151,10 @@ function bean_usage_output($bean = NULL) { $query->union(_bean_usage_field_data($data_table, $i, $field_name, $entity_types, $bundles, $filters, $delta_specific, $bean)); } } + } + // Get the data $data = $query->execute()->fetchAll(0); @@ -177,17 +197,41 @@ function bean_usage_output($bean = NULL) { break; } - $content[$bean_data->label][$bean_data->entity_type][$bean_data->entity_id]['bean_title'] = $bean_data->title; - $content[$bean_data->label][$bean_data->entity_type][$bean_data->entity_id]['bean_type'] = $bean_data->type; - $content[$bean_data->label][$bean_data->entity_type][$bean_data->entity_id]['entity_id'] = $bean_data->entity_id; - $content[$bean_data->label][$bean_data->entity_type][$bean_data->entity_id]['entity_title'] = $entity_title; - - if ($delta_specific) { - $delta_found = TRUE; + if ($delta_specific == TRUE && + variable_get('bean_usage_include_field_revisions', FALSE)) { + // test to see if this revision is still available. It may not necessarily be available + // due to workflow and other issues. + $revision = node_load($bean_data->entity_id, $bean_data->revision_id); + if ($revision != NULL) { + $content[$bean_data->entity_id . $bean_data->revision_id][$bean_data->entity_type][$bean_data->entity_id]['bean_title'] = $bean_data->title; + $content[$bean_data->entity_id . $bean_data->revision_id][$bean_data->entity_type][$bean_data->entity_id]['bean_type'] = $bean_data->type; + $content[$bean_data->entity_id . $bean_data->revision_id][$bean_data->entity_type][$bean_data->entity_id]['entity_id'] = "$bean_data->entity_id:{$bean_data->revision_id}"; + $content[$bean_data->entity_id . $bean_data->revision_id][$bean_data->entity_type][$bean_data->entity_id]['entity_title'] = $entity_title; + $content[$bean_data->entity_id . $bean_data->revision_id][$bean_data->entity_type][$bean_data->entity_id]['path'] = "{$bean_data->entity_id}/revisions/{$bean_data->revision_id}/view"; + } + } else { + $content[$bean_data->entity_id][$bean_data->entity_type][$bean_data->entity_id]['bean_title'] = $bean_data->title; + $content[$bean_data->entity_id][$bean_data->entity_type][$bean_data->entity_id]['bean_type'] = $bean_data->type; + $content[$bean_data->entity_id][$bean_data->entity_type][$bean_data->entity_id]['entity_id'] = $bean_data->entity_id; + $content[$bean_data->entity_id][$bean_data->entity_type][$bean_data->entity_id]['entity_title'] = $entity_title; + $content[$bean_data->entity_id][$bean_data->entity_type][$bean_data->entity_id]['path'] = $bean_data->entity_id; } } } + // Set up output table + $bean_table_data = array( + '#theme' => 'table', + '#attributes' => array( // set table attributes + 'width' => '100%', // width + 'id' => 'bean-usage-block-reference', + ), + '#header' => _bean_usage_table_headers($bean_delta), + '#rows' => array(), // table rows + '#empty' => t("No usage to report."), + '#caption' => t("Uses of this Bean."), + ); + // If we have any usage data create and display the table of data if (!empty($content)) { $rows = count($content); @@ -195,17 +239,12 @@ function bean_usage_output($bean = NULL) { // set up pager variables pager_default_initialize($rows, $results_per_page, $element = 0); - // Set up output table - $bean_table_data = array( - 'attributes' => array( // set table attributes - 'width' => '100%' // width - ), - 'header' => _bean_usage_table_headers($bean_delta), - 'rows' => array(), // table rows - ); - if ($filters) { - $bean_table_data['caption'] = t('Filters: ') . $filters; + + if (!$delta_specific && count($filters) == 0) { + $bean_table_data['#caption'] = t("No Filters"); + } elseif ($delta_specific && variable_get('bean_usage_include_field_revisions', FALSE)) { + $bean_table_data['#caption'] = t("This report includes past revisions."); } // Get the result subset for the current page @@ -265,22 +304,22 @@ function bean_usage_output($bean = NULL) { // add the usage data to the table // We only need to add the Bean label once per delta, Since we set it above we check for its emptiness if (!empty($bean_label_cell)) { - $bean_table_data['rows'][] = array( + $bean_table_data['#rows'][] = array( 0 => $bean_label_cell, 1 => $bean_title_cell, 2 => $bean_type_cell, 3 => array( - 'data' => $text_prefix . l($entity['entity_title'], $link_prefix . $entity['entity_id']), + 'data' => $text_prefix . l($entity['entity_title'], $link_prefix . $entity['path']), 'width' => '30%', 'no_striping' => TRUE ), ); } // if (!empty($bean_label_cell)) else { - $bean_table_data['rows'][] = array( + $bean_table_data['#rows'][] = array( $text_prefix . l( t($entity['entity_title']), - $link_prefix . $entity['entity_id'], + $link_prefix . $entity['path'], array( 'attributes' => array( 'title' => $entity['entity_title'], @@ -296,23 +335,25 @@ function bean_usage_output($bean = NULL) { } //foreach ($entity_type) } // foreach ($usage) // Set the output using theme_table with the header and rows created above - if (!$delta_specific) { - $output .= drupal_render($bean_usage_form); - } - $output .= theme('table', $bean_table_data); - $output .= theme('pager'); } // if (!empty($usage)) - else { - if ($delta_specific) { - $output = '

' . t('This bean is not used anywhere on the site.') . '

'; - } - else { - $output .= $bean_usage_form; - $output .= 'There is no bean usage to report for '. $filters; - } - } // else + if (!$delta_specific) { + $output['bean_filters'] = $bean_usage_form; + } + if (is_array($bean_table_data)) { + $output['bean_table_data'] = $bean_table_data; + + $output['bean_table_pager'] = array( + '#theme' => 'pager', + ); + } } // if (!empty($fields)) + // On an individual bean page, also show the the context and core pages. + if ($delta_specific) { + $output['bean_usage_context'] = _bean_usage_get_context_usage($bean); + $output['bean_usage_core'] = _bean_usage_get_core($bean); + } + // return the output for page rendering return $output; } @@ -422,6 +463,7 @@ function _bean_usage_field_data( $data_table, $i, $field_name, $entity_types, $b $query->join('bean', 'b', 'b.delta = bl.delta'); $query->fields('b', array('bid', 'label', 'title', 'type')); $query->fields('fd'. $i, array('entity_id', 'delta', 'entity_type')); + $query->addField('b', 'delta', 'bean_delta'); $query->addField('fd'. $i, $field_name . '_bid', 'bid'); $query_and = db_and(); $query_and->condition('bl.module', 'bean'); @@ -446,6 +488,19 @@ function _bean_usage_field_data( $data_table, $i, $field_name, $entity_types, $b } $query->condition($query_and); + + // This will check the revision table if the appropriate option + // is set and it's a delta-specific request. + if ($delta_specific && variable_get('bean_usage_include_field_revisions', FALSE)) { + $revision_table = "field_revision_" . $field_name; + $query->addField('fr'. $i, "revision_id", 'revision_id'); + $query->leftJoin($revision_table, + 'fr' . $i, + "fr$i.{$field_name}_bid = fd$i.{$field_name}_bid"); + $query->condition("fr$i.entity_type", "node"); + } + + return $query; } @@ -523,3 +578,121 @@ function bean_usage_sort_by_title($a, $b) { function bean_usage_sort_by_type($a, $b) { return strcmp($a->type, $b->type); } + + /** + * Helper function to get context usage. We are just going to inspect + * each context to see if this block is present in the context. + * @param $bean + * @return array + */ + function _bean_usage_get_context_usage($bean) { + $retval = array(); + if (module_exists("context") && variable_get("bean_usage_show_context", TRUE)) { + $admin_context = user_access("administer contexts"); + $show_context = user_access("always show context"); + // If the user cannot administer the context UI and does not have + // rights to see context placements in the report, then return immediately. + if (!$admin_context && !$show_context) { return $retval; } + $modules["context"] = t("Context"); + $rows = array(); + $contexts = context_context_list(); + foreach ($contexts as $context) { + $this_context = context_load($context); + if (isset($this_context->reactions['block'])) { + if (isset($this_context->reactions['block']['blocks'])) { + foreach ($this_context->reactions['block']['blocks'] as $block) { + if ($block['module'] == 'bean' && $block['delta'] == $bean->delta) { + $link = l("Edit", "admin/structure/context/list/{$this_context->name}/edit"); + if (!$admin_context && $show_context) { + $link = ""; + } + $rows[] = array( + $this_context->name, + $block['region'], + $link, + ); + } + } + } + } + } + + $header = array( + array( + "data" => t("Context"), + ), + array( + "data" => t("Theme Region"), + ), + array( + "data" => t("Link"), + ), + ); + + $retval = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + "#attributes" => array("width" => "100%", 'id' => 'bean-usage-context'), + "#sticky" => TRUE, + '#empty' => t("This bean is not used in any block context reactions."), + '#caption' => t("Context"), + ); + } + return $retval; + + } + + function _bean_usage_get_core($bean) { + $retval = ""; + + + if (variable_get("bean_usage_show_core", TRUE)) { + $admin_context = user_access("administer blocks"); + $show_context = user_access("always show core"); + + if (!$admin_context && !$show_context) { return $retval; } + + $link_title = l("Drupal Block Settings", "admin/structure/block/manage/bean/{$bean->delta}/configure"); + // Don't print a link to the block settings if the user does not have permission + if (!$admin_context && $show_context) { + $link_title = "Drupal Block Settings"; + } + + $rows = array(); + $sql = "select * from {block} where module='bean' and region <> -1 and delta=:delta"; + $results = db_query($sql, array(":delta" => $bean->delta)); + foreach ($results as $result) { + // If the region property is empty it then means that this block + // was previously assigned to a region but it no longer is, so + // we can safely ignore it. + if (empty($result->region)) { continue; } + $rows[] = array( + "data" => array($result->theme, $result->region), + ); + } + + + $header = array( + array( + "data" => t("Theme"), + ), + array( + "data" => t("Theme Region"), + ), + ); + + + $retval['blocktable'] = array( + '#theme' => 'table', + '#header' => $header, + '#rows' => $rows, + "#attributes" => array("width" => "100%", 'id' => 'bean-usage-core',), + "#sticky" => TRUE, + '#empty' => t("This bean is not used in any Drupal block settings."), + "#caption" => $link_title, + ); + + } + return $retval; + } \ No newline at end of file diff --git a/bean_usage/includes/bean_usage.forms.inc b/bean_usage/includes/bean_usage.forms.inc index 28210ee..7c6ecb8 100644 --- a/bean_usage/includes/bean_usage.forms.inc +++ b/bean_usage/includes/bean_usage.forms.inc @@ -9,26 +9,61 @@ function bean_usage_settings() { '#collapsible' => FALSE, ); - $form['bean_usage_results']['bean_usage_results_per_page'] = array( - '#title' => t('Results per page'), - '#description' => t('How many results display per page on the bean usage page'), - '#type' => 'select', - '#options' => array( - '5' => 5, - '10' => 10, - '15' => 15, - '20' => 20, - '25' => 25, - '30' => 30, - '35' => 35, - '40' => 40, - '45' => 45, - '50' => 50, - ), - '#default_value' => variable_get('bean_usage_results_per_page', 30), + if (module_exists("blockreference")) { + + $form['bean_usage_results']['bean_usage_show_blockreference'] = array( + '#title' => t("Inspect Blockreference"), + '#description' => t("Allow Bean Usage to inspect Block Reference fields for usage"), + '#type' => 'checkbox', + '#default_value' => variable_get("bean_usage_show_blockreference", TRUE), + ); + + $form['bean_usage_results']['bean_usage_results_per_page'] = array( + '#title' => t('Results per page'), + '#description' => t('How many results display per page on the bean usage page'), + '#type' => 'select', + '#options' => array( + '5' => 5, + '10' => 10, + '15' => 15, + '20' => 20, + '25' => 25, + '30' => 30, + '35' => 35, + '40' => 40, + '45' => 45, + '50' => 50, + ), + '#default_value' => variable_get('bean_usage_results_per_page', 30), + ); + + $form['bean_usage_results']['bean_usage_include_field_revisions'] = array( + '#title' => t("Include Revisioned Fields"), + '#description' => t("Inspect an entity's field revisions for prior usage of bean. Only usable on an individual bean's history page."), + '#type' => 'checkbox', + '#default_value' => variable_get('bean_usage_include_field_revisions', FALSE), + ); + + } + + if (module_exists("context")) { + $form['bean_usage_results']['bean_usage_show_context'] = array( + '#title' => t("Inspect Contexts"), + '#description' => t("Allow Bean Usage to inspect Context for usage"), + '#type' => 'checkbox', + '#default_value' => variable_get("bean_usage_show_context", TRUE), + ); + } + + $form['bean_usage_results']['bean_usage_show_core'] = array( + '#title' => t("Inspect Core"), + '#description' => t("Allow Bean Usage to inspect the core Drupal block placement for usage"), + '#type' => 'checkbox', + '#default_value' => variable_get("bean_usage_show_core", TRUE), ); return system_settings_form($form); + } /** @@ -75,14 +110,14 @@ function bean_usage_filters() { '#title' => t('Title'), '#prefix' => '
', '#suffix' => '
', - '#default_value' => $filters['title'], + '#default_value' => isset($filters['title']) ? $filters['title'] : '', ); $form['bean_usage_filter']['bean_usage_filter_label'] = array( '#type' => 'textfield', '#title' => t('Label'), '#prefix' => '
', '#suffix' => '
', - '#default_value' => $filters['label'], + '#default_value' => isset($filters['label']) ? $filters['label'] : '', ); $form['bean_usage_filter']['actions'] = array( diff --git a/bean_uuid/bean_uuid.info b/bean_uuid/bean_uuid.info index 46507bd..467e2d7 100644 --- a/bean_uuid/bean_uuid.info +++ b/bean_uuid/bean_uuid.info @@ -6,3 +6,10 @@ dependencies[] = bean dependencies[] = uuid package = Bean + +; Information added by Drupal.org packaging script on 2015-03-04 +version = "7.x-1.9" +core = "7.x" +project = "bean" +datestamp = "1425439382" + diff --git a/includes/bean.inline_entity_form.inc b/includes/bean.inline_entity_form.inc new file mode 100644 index 0000000..8d9fb48 --- /dev/null +++ b/includes/bean.inline_entity_form.inc @@ -0,0 +1,269 @@ + t('block'), + 'plural' => t('blocks'), + ); + return $labels; + } + + /** + * Overrides EntityInlineEntityFormController::tableFields(). + */ + public function tableFields($bundles) { + $fields = array(); + + $fields['label'] = array( + 'type' => 'property', + 'label' => t('Label'), + 'weight' => 1, + ); + + return $fields; + } + + /** + * Overrides EntityInlineEntityFormController::defaultSettings(). + */ + public function defaultSettings() { + $defaults = parent::defaultSettings(); + $defaults['parent_sync_label'] = FALSE; + $defaults['parent_sync_title'] = FALSE; + + return $defaults; + } + + /** + * Overrides EntityInlineEntityFormController::settingsForm(). + */ + public function settingsForm($field, $instance) { + $form = parent::settingsForm($field, $instance); + + $form['parent_sync_label'] = array( + '#type' => 'checkbox', + '#title' => t('Auto set the block label to the parent @entity entity label', array('@entity' => $instance['entity_type'])), + '#description' => t('This will hide the label input field and set the label to the @entity entity label.', array('@entity' => $instance['entity_type'])), + '#default_value' => $this->settings['parent_sync_label'], + ); + + $form['parent_sync_title'] = array( + '#type' => 'checkbox', + '#title' => t('Auto set the block title to the parent @entity entity label', array('@entity' => $instance['entity_type'])), + '#description' => t('This will hide the title input field and set the title to the @entity entity label.', array('@entity' => $instance['entity_type'])), + '#default_value' => $this->settings['parent_sync_title'], + ); + + return $form; + } + + /** + * Overrides EntityInlineEntityFormController::entityForm(). + */ + public function entityForm($entity_form, &$form_state) { + $bean = $entity_form['#entity']; + $type = bean_type_load($bean->type); + $extra_fields = field_info_extra_fields('bean', $bean->type, 'form'); + + if (!isset($bean->label)) { + $bean->label = NULL; + } + + $entity_form['label'] = array( + '#type' => 'textfield', + '#title' => t('@type Label', array('@type' => check_plain($type->getLabel()))), + '#required' => TRUE, + '#default_value' => $bean->label, + '#maxlength' => 255, + // Check if extra fields define a weight. + '#weight' => !empty($extra_fields['label']) ? $extra_fields['label']['weight'] : -5, + ); + + $entity_form['title'] = array( + '#type' => 'textfield', + '#title' => t('@type Title', array('@type' => check_plain($type->getLabel()))), + '#default_value' => $bean->title, + '#maxlength' => 255, + // Check if extra fields define a weight. + '#weight' => !empty($extra_fields['title']) ? $extra_fields['title']['weight'] : -5, + ); + + $entity_form['revision'] = array( + '#weight' => 10, + ); + + if (isset($bean->is_new)) { + $entity_form['revision']['#access'] = FALSE; + } + + ctools_include('dependent'); + ctools_add_js('dependent'); + + $entity_form['revision']['is_new_revision'] = array( + '#type' => 'checkbox', + '#title' => t('Create new revision'), + '#default_value' => 1, + '#id' => 'edit-revision', + ); + + if (isset($bean->is_new)) { + $entity_form['default_revision'] = array( + '#type' => 'value', + '#value' => TRUE, + ); + } + else { + $entity_form['revision']['default_revision'] = array( + '#type' => 'checkbox', + '#title' => t('Set Revision as default'), + '#default_value' => $bean->isDefaultRevision(), + '#states' => array( + // Hide if the option above is disabled, to avoid potential dataloss. + 'invisible' => array( + ':input[name="is_new_revision"]' => array('checked' => FALSE), + ), + ), + ); + } + + $entity_form['revision']['log'] = array( + '#type' => 'textarea', + '#title' => t('Log message'), + '#description' => t('Provide an explanation of the changes you are making. This will help other authors understand your motivations.'), + '#dependency' => array('edit-revision' => array(1)), + '#default_value' => '', + ); + + // The view mode. + if (user_access('edit bean view mode')) { + $bean_info = $bean->entityInfo(); + foreach ($bean_info['view modes'] as $view_mode_name => $data) { + $view_modes[$view_mode_name] = $data['label']; + } + + $entity_form['view_mode'] = array( + '#title' => t('View Mode'), + '#description' => t('Edit the view mode of the Bean'), + '#default_value' => $bean->view_mode, + '#type' => 'select', + '#required' => TRUE, + '#options' => $view_modes, + // Check if extra fields define a weight. + '#weight' => !empty($extra_fields['view_mode']) ? $extra_fields['view_mode']['weight'] : -8, + ); + } + else { + $entity_form['view_mode'] = array( + '#type' => 'value', + '#value' => $bean->view_mode, + ); + } + + // Get the Bean type form + $entity_form += $bean->getForm($entity_form, $form_state); + + // Hide the title field if it is auto-generated. + if ($this->settings['parent_sync_label']) { + $entity_form['label']['#required'] = FALSE; + $entity_form['label']['#access'] = FALSE; + } + + // Hide the title field if it is auto-generated. + if ($this->settings['parent_sync_title']) { + $entity_form['title']['#required'] = FALSE; + $entity_form['title']['#access'] = FALSE; + // Hide the replacement field added by the Title module as well. + if (module_exists('title')) { + $title_field = title_field_replacement_info('bean', 'title'); + if ($title_field) { + $title_field_name = $title_field['field']['field_name']; + if (isset($entity_form[$title_field_name])) { + $entity_form[$title_field_name]['#access'] = FALSE; + $entity_form[$title_field_name]['#required'] = FALSE; + } + } + } + } + + return parent::entityForm($entity_form, $form_state); + } + + /** + * Overrides EntityInlineEntityFormController::entityFormSubmit(). + */ + public function entityFormSubmit(&$entity_form, &$form_state) { + if (isset($form_state['redirect'])) { + $before = $form_state['redirect']; + } + + // The parents array tells us exactly what part of the form was + // submitted. We're going to mock out a subsection of $form_state to + // pass to bean_form_submit instead of the whole thing. + $parents = $entity_form['#parents']; + $ief_form_state['bean'] = $entity_form['#entity']; + $ief_form_state['values'] = $form_state['values']; + foreach ($parents as $parent) { + $ief_form_state['values'] = $ief_form_state['values'][$parent]; + } + + // Get lables to set temporary label and title. + $display_labels = $this->labels(); + + // Set label since it will be auto generated based on the parent entity. + if (empty($ief_form_state['bean']->label) && $this->settings['parent_sync_label']) { + $ief_form_state['values']['label'] = $display_labels['singular']; + } + + // Set title since it will be auto generated based on the parent entity. + if (empty($ief_form_state['bean']->title) && $this->settings['parent_sync_title']) { + $ief_form_state['values']['title'] = $display_labels['singular']; + } + + // Load bean.pages.inc so we can call bean_form_submit + module_load_include('inc', 'bean', 'includes/bean.pages'); + + // Saves initial bean via bean_form_submit(). + bean_form_submit($entity_form, $ief_form_state); + + // Undo the redirect set by bean_form_submit(). + if (isset($form_state['redirect'])) { + if (isset($before)) { + $form_state['redirect'] = $before; + } + else { + unset($form_state['redirect']); + } + } + } + + /** + * Overrides EntityInlineEntityFormController::save(). + */ + public function save($entity, $context) { + if ($this->settings['parent_sync_label'] || $this->settings['parent_sync_title']) { + $parent_label = entity_label($context['parent_entity_type'], $context['parent_entity']); + + // Set label to the parent label. + if ($this->settings['parent_sync_label']) { + $entity->label = $parent_label; + } + + // Set title to the parent label. + if ($this->settings['parent_sync_title']) { + $entity->title = $parent_label; + } + } + + bean_save($entity); + } +} diff --git a/tests/bean_test.info b/tests/bean_test.info index 806ae52..6a2a47b 100644 --- a/tests/bean_test.info +++ b/tests/bean_test.info @@ -6,3 +6,10 @@ dependencies[] = bean files[] = bean_test.module hidden = TRUE + +; Information added by Drupal.org packaging script on 2015-03-04 +version = "7.x-1.9" +core = "7.x" +project = "bean" +datestamp = "1425439382" +