brisk-bills 0.7.0 → 0.8.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +7 -0
- data/Gemfile +11 -0
- data/Gemfile.lock +55 -0
- data/TODO.txt +36 -67
- data/app/controllers/admin/activities_controller.rb +4 -3
- data/app/controllers/admin/activities_with_prices_controller.rb +28 -14
- data/app/controllers/admin/client_accounting_controller.rb +11 -8
- data/app/controllers/admin/client_representatives_controller.rb +34 -5
- data/app/controllers/admin/clients_controller.rb +1 -1
- data/app/controllers/admin/draft_invoices_controller.rb +92 -0
- data/app/controllers/admin/{employee_client_labor_rate_controller.rb → employee_client_labor_rates_controller.rb} +1 -1
- data/app/controllers/admin/employees_controller.rb +3 -4
- data/app/controllers/admin/invoices_controller.rb +111 -53
- data/app/controllers/admin/payments_controller.rb +168 -41
- data/app/controllers/authentication_controller.rb +3 -3
- data/app/helpers/admin/activities_helper.rb +16 -13
- data/app/helpers/admin/activities_helper/labor_helper.rb +4 -4
- data/app/helpers/admin/activities_helper/proposal_helper.rb +1 -1
- data/app/helpers/admin/activities_helper/slimtimer_helper.rb +1 -1
- data/app/helpers/admin/activities_with_prices_helper.rb +2 -2
- data/app/helpers/admin/activity_type_controller_helper.rb +6 -0
- data/app/helpers/admin/activity_type_field_helper.rb +9 -9
- data/app/helpers/admin/adjustments_helper.rb +9 -1
- data/app/helpers/admin/client_accounting_helper.rb +2 -2
- data/app/helpers/admin/client_financial_transactions_helper.rb +1 -1
- data/app/helpers/admin/client_representatives_helper.rb +16 -12
- data/app/helpers/admin/clients_helper.rb +2 -0
- data/app/helpers/admin/draft_invoices_helper.rb +24 -0
- data/app/helpers/admin/{employee_client_labor_rate_helper.rb → employee_client_labor_rates_helper.rb} +8 -8
- data/app/helpers/admin/employees_helper.rb +6 -0
- data/app/helpers/admin/has_credential_column_helper.rb +8 -8
- data/app/helpers/admin/invoices_helper.rb +71 -16
- data/app/helpers/admin/is_active_column_helper.rb +2 -2
- data/app/helpers/admin/labors_helper.rb +12 -1
- data/app/helpers/admin/labors_helper/slimtimer_helper.rb +1 -1
- data/app/helpers/admin/materials_helper.rb +11 -0
- data/app/helpers/admin/payments_helper.rb +204 -29
- data/app/helpers/admin/proposals_helper.rb +10 -0
- data/app/helpers/admin/settings_helper.rb +1 -1
- data/app/helpers/admin_layout_helper.rb +3 -6
- data/app/helpers/authentication_helper.rb +7 -10
- data/app/helpers/money_model_helper.rb +1 -2
- data/app/models/activity.rb +17 -7
- data/app/models/client.rb +35 -8
- data/app/{model_views → models}/client_financial_transaction.rb +0 -0
- data/app/models/client_representative.rb +6 -14
- data/app/models/credential.rb +1 -1
- data/app/models/employee.rb +9 -11
- data/app/models/invoice.rb +13 -9
- data/app/models/invoice_payment.rb +1 -1
- data/app/models/notifier.rb +2 -2
- data/app/models/payment.rb +51 -7
- data/app/models/setting.rb +3 -1
- data/app/views/active_scaffold_overrides/add_existing.js.rjs +25 -0
- data/app/views/admin/activities/_adjustment_column.html.erb +10 -0
- data/app/views/admin/activities/{_form.rhtml → _form.html.erb} +0 -0
- data/app/views/admin/activities/{_form_attribute.rhtml → _form_attribute.html.erb} +0 -0
- data/app/views/admin/activities/{_labor_column.rhtml → _labor_column.html.erb} +0 -0
- data/app/views/admin/activities/{_material_column.rhtml → _material_column.html.erb} +0 -0
- data/app/views/admin/activities/{_proposal_column.rhtml → _proposal_column.html.erb} +0 -0
- data/app/views/admin/activities_with_prices/{move_to_invoice.rhtml → move_to_invoice.html.erb} +2 -2
- data/app/views/admin/activities_with_prices/move_to_invoice.js.rjs +5 -0
- data/app/views/admin/draft_invoices/batch_create.html.erb +73 -0
- data/app/views/admin/draft_invoices/batch_create.js.rjs +5 -0
- data/app/views/admin/invoices/confirm_publish_modal.html.erb +48 -0
- data/app/views/admin/payments/commit_payment_warning.html.erb +8 -0
- data/app/views/admin/payments/observation_error.js.rjs +28 -0
- data/app/views/admin/payments/on_assignment_observation.js.rjs +28 -0
- data/app/views/authentication/{email.rjs → email.js.rjs} +0 -0
- data/app/views/authentication/{login.rhtml → login.html.erb} +21 -26
- data/app/views/authentication/{login.rjs → login.js.rjs} +0 -0
- data/app/views/authentication/{reset_password_via_token.rhtml → reset_password_via_token.html.erb} +0 -0
- data/app/views/authentication/{reset_password_via_token.rjs → reset_password_via_token.js.rjs} +0 -0
- data/app/views/authentication/{sign_in_error.rjs → sign_in_error.js.rjs} +0 -0
- data/app/views/layouts/{_navigation_tree.rhtml → _navigation_tree.html.erb} +0 -0
- data/app/views/layouts/{admin.rhtml → admin.html.erb} +0 -0
- data/app/views/layouts/{public.rhtml → public.html.erb} +0 -0
- data/app/views/notifier/{_email_footer.html.rhtml → _email_footer.html.erb} +0 -0
- data/app/views/notifier/{_email_footer.plain.rhtml → _email_footer.plain.erb} +0 -0
- data/app/views/notifier/{_email_header.html.rhtml → _email_header.html.erb} +0 -0
- data/app/views/notifier/invoice_available.html.erb +5 -0
- data/app/views/notifier/{invoice_available.plain.rhtml → invoice_available.plain.erb} +1 -1
- data/app/views/notifier/{reset_password_requested.html.rhtml → reset_password_requested.html.erb} +2 -2
- data/app/views/notifier/{reset_password_requested.plain.rhtml → reset_password_requested.plain.erb} +1 -1
- data/config/environment.rb +6 -5
- data/config/locale/en.rb +9 -0
- data/db/migrate/001_create_employees.rb +1 -1
- data/db/migrate/002_create_employee_slimtimers.rb +1 -1
- data/db/migrate/003_create_slimtimer_tasks.rb +1 -1
- data/db/migrate/004_create_slimtimer_time_entries.rb +1 -1
- data/db/migrate/005_create_clients.rb +1 -1
- data/db/migrate/006_create_client_representatives.rb +1 -1
- data/db/migrate/008_create_activities.rb +1 -1
- data/db/migrate/009_create_activity_labors.rb +1 -1
- data/db/migrate/010_create_employee_client_labor_rates.rb +1 -1
- data/db/migrate/011_create_activity_adjustments.rb +1 -1
- data/db/migrate/012_create_activity_materials.rb +1 -1
- data/db/migrate/013_create_activity_proposals.rb +1 -1
- data/db/migrate/014_create_invoices.rb +1 -1
- data/db/migrate/015_create_payments.rb +1 -1
- data/db/migrate/016_create_payment_methods.rb +1 -1
- data/db/migrate/017_create_invoice_payments.rb +1 -1
- data/db/migrate/018_create_activity_types.rb +2 -2
- data/db/migrate/019_create_settings.rb +1 -1
- data/db/migrate/023_create_credentials_migrate_representatives.rb +2 -2
- data/db/migrate/028_money_to_cents.rb +2 -2
- data/db/schema.rb +10 -10
- data/lib/brisk-bills.rb +2 -2
- data/lib/brisk-bills/initializer.rb +2 -2
- data/lib/generators/instance/templates/instance_environment.rb +1 -1
- data/lib/libpptable.rb +48 -0
- data/lib/tasks/create_last_months_invoices.rake +1 -14
- data/lib/tasks/first_time_setup.rake +2 -2
- data/lib/tasks/package.rake +2 -1
- data/lib/tasks/payment_assignment_consistency_check.rake +110 -0
- data/lib/utilities.rb +4 -4
- data/public/images/page-new.gif +0 -0
- data/public/javascripts/active_scaffold/default/active_scaffold.js +532 -430
- data/public/javascripts/active_scaffold/default/dhtml_history.js +1 -1
- data/public/javascripts/active_scaffold/default/form_enhancements.js +7 -4
- data/public/stylesheets/active_scaffold/default/stylesheet-ie.css +5 -5
- data/public/stylesheets/active_scaffold/default/stylesheet.css +54 -18
- data/public/stylesheets/admin/global.css +1 -1
- data/public/stylesheets/admin/pages.css +29 -0
- data/test/unit/activity/adjustment_test.rb +1 -1
- data/test/unit/activity/labor_test.rb +1 -1
- data/test/unit/activity/material_test.rb +1 -1
- data/test/unit/activity/proposal_test.rb +1 -1
- data/test/unit/activity_test.rb +1 -1
- data/test/unit/activity_type_test.rb +1 -1
- data/test/unit/client_eventlog_test.rb +1 -1
- data/test/unit/client_financial_transaction_test.rb +1 -1
- data/test/unit/client_representative_test.rb +1 -1
- data/test/unit/client_test.rb +37 -6
- data/test/unit/credential_test.rb +1 -1
- data/test/unit/employee/slimtimer_test.rb +1 -1
- data/test/unit/employee_client_labor_rate_test.rb +1 -1
- data/test/unit/employee_test.rb +1 -1
- data/test/unit/helpers/admin/draft_invoices_helper_test.rb +4 -0
- data/test/unit/invoice_payment_test.rb +90 -50
- data/test/unit/invoice_test.rb +48 -8
- data/test/unit/notifier_test.rb +1 -1
- data/test/unit/payment_method_test.rb +1 -1
- data/test/unit/payment_test.rb +7 -7
- data/test/unit/setting_test.rb +1 -1
- data/test/unit/slimtimer_task_test.rb +1 -1
- data/test/unit/slimtimer_time_entry_test.rb +1 -1
- data/vendor/plugins/active_scaffold/CHANGELOG +3 -1
- data/vendor/plugins/active_scaffold/README +18 -5
- data/vendor/plugins/active_scaffold/environment.rb +1 -1
- data/vendor/plugins/active_scaffold/frontends/default/javascripts/active_scaffold.js +532 -430
- data/vendor/plugins/active_scaffold/frontends/default/javascripts/dhtml_history.js +1 -1
- data/vendor/plugins/active_scaffold/frontends/default/javascripts/form_enhancements.js +7 -4
- data/vendor/plugins/active_scaffold/frontends/default/stylesheets/stylesheet-ie.css +5 -5
- data/vendor/plugins/active_scaffold/frontends/default/stylesheets/stylesheet.css +54 -18
- data/vendor/plugins/active_scaffold/frontends/default/views/_add_existing_form.html.erb +3 -7
- data/vendor/plugins/active_scaffold/frontends/default/views/_create_form.html.erb +10 -7
- data/vendor/plugins/active_scaffold/frontends/default/views/_field_search.html.erb +7 -12
- data/vendor/plugins/active_scaffold/frontends/default/views/_form.html.erb +3 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_association.html.erb +15 -20
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_association_footer.html.erb +8 -10
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_attribute.html.erb +5 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_hidden_attribute.html.erb +2 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform.html.erb +19 -21
- data/vendor/plugins/active_scaffold/frontends/default/views/{_form_association_header.html.erb → _horizontal_subform_header.html.erb} +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/_horizontal_subform_record.html.erb +31 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_list.html.erb +4 -18
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_actions.html.erb +18 -5
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_calculations.html.erb +2 -9
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_column_headings.html.erb +4 -4
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_header.html.erb +6 -6
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_inline_adapter.html.erb +2 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_messages.html.erb +20 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_pagination.html.erb +11 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_pagination_links.html.erb +3 -5
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_record.html.erb +2 -26
- data/vendor/plugins/active_scaffold/frontends/default/views/_list_record_columns.html.erb +9 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_nested.html.erb +3 -12
- data/vendor/plugins/active_scaffold/frontends/default/views/_render_fields.js.rjs +11 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_search.html.erb +17 -11
- data/vendor/plugins/active_scaffold/frontends/default/views/_show.html.erb +3 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/_show_columns.html.erb +8 -7
- data/vendor/plugins/active_scaffold/frontends/default/views/_update_actions.html.erb +3 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/_update_form.html.erb +9 -6
- data/vendor/plugins/active_scaffold/frontends/default/views/_vertical_subform.html.erb +7 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/_vertical_subform_record.html.erb +38 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/add_existing.js.rjs +2 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/delete.html.erb +1 -1
- data/vendor/plugins/active_scaffold/frontends/default/views/destroy.js.rjs +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/edit_associated.js.rjs +20 -15
- data/vendor/plugins/active_scaffold/frontends/default/views/list.html.erb +12 -8
- data/vendor/plugins/active_scaffold/frontends/default/views/list.js.rjs +1 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/mark.js.rjs +6 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/on_create.js.rjs +12 -8
- data/vendor/plugins/active_scaffold/frontends/default/views/on_update.js.rjs +13 -6
- data/vendor/plugins/active_scaffold/frontends/default/views/render_field.js.rjs +1 -0
- data/vendor/plugins/active_scaffold/frontends/default/views/search.html.erb +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/update.html.erb +2 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/update_column.js.rjs +4 -3
- data/vendor/plugins/active_scaffold/frontends/default/views/update_row.js.rjs +2 -0
- data/vendor/plugins/active_scaffold/init.rb +2 -2
- data/vendor/plugins/active_scaffold/install.rb +1 -2
- data/vendor/plugins/active_scaffold/install_assets.rb +1 -1
- data/vendor/plugins/active_scaffold/lib/active_record_permissions.rb +53 -42
- data/vendor/plugins/active_scaffold/lib/active_scaffold.rb +96 -23
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/common_search.rb +18 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/core.rb +152 -102
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/create.rb +81 -49
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/delete.rb +44 -17
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/field_search.rb +60 -46
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/list.rb +42 -37
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/mark.rb +72 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/nested.rb +94 -92
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/search.rb +54 -40
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/show.rb +30 -10
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/update.rb +62 -47
- data/vendor/plugins/active_scaffold/lib/active_scaffold/attribute_params.rb +187 -185
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/base.rb +28 -3
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/core.rb +43 -3
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/create.rb +8 -15
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/delete.rb +3 -4
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/field_search.rb +19 -17
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/form.rb +2 -9
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/list.rb +46 -9
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/nested.rb +17 -7
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/search.rb +36 -16
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/show.rb +5 -12
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/subform.rb +8 -6
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/update.rb +12 -8
- data/vendor/plugins/active_scaffold/lib/active_scaffold/configurable.rb +2 -2
- data/vendor/plugins/active_scaffold/lib/active_scaffold/constraints.rb +173 -178
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/action_columns.rb +101 -97
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/action_link.rb +29 -19
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/column.rb +74 -34
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/columns.rb +74 -74
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/set.rb +57 -62
- data/vendor/plugins/active_scaffold/lib/active_scaffold/data_structures/sorting.rb +73 -3
- data/vendor/plugins/active_scaffold/lib/active_scaffold/finder.rb +304 -234
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/association_helpers.rb +40 -40
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/controller_helpers.rb +39 -24
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/country_helpers.rb +32 -28
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/form_column_helpers.rb +157 -86
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/id_helpers.rb +7 -7
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/list_column_helpers.rb +278 -85
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/pagination_helpers.rb +38 -12
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/search_column_helpers.rb +74 -35
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/show_column_helpers.rb +53 -46
- data/vendor/plugins/active_scaffold/lib/active_scaffold/helpers/view_helpers.rb +51 -17
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/de.yml +69 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/en.yml +72 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/es.yml +23 -13
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/fr.yml +68 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/hu.yml +24 -14
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/ja.yml +69 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/ru.yml +72 -0
- data/vendor/plugins/active_scaffold/lib/active_scaffold/marked_model.rb +38 -0
- data/vendor/plugins/active_scaffold/lib/bridges/calendar_date_select/lib/as_cds_bridge.rb +47 -13
- data/vendor/plugins/active_scaffold/lib/bridges/dependent_protect/bridge.rb +10 -0
- data/vendor/plugins/active_scaffold/lib/bridges/dependent_protect/lib/dependent_protect_bridge.rb +11 -0
- data/vendor/plugins/active_scaffold/lib/bridges/file_column/lib/as_file_column_bridge.rb +3 -6
- data/vendor/plugins/active_scaffold/lib/bridges/file_column/lib/form_ui.rb +10 -2
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/bridge.rb +13 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/form_ui.rb +20 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/list_ui.rb +16 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/paperclip_bridge.rb +32 -0
- data/vendor/plugins/active_scaffold/lib/bridges/paperclip/lib/paperclip_bridge_helpers.rb +18 -0
- data/vendor/plugins/active_scaffold/lib/bridges/record_select/bridge.rb +5 -0
- data/vendor/plugins/active_scaffold/lib/bridges/record_select/lib/record_select_bridge.rb +79 -0
- data/vendor/plugins/active_scaffold/lib/bridges/semantic_attributes/bridge.rb +5 -0
- data/vendor/plugins/active_scaffold/lib/bridges/semantic_attributes/lib/semantic_attributes_bridge.rb +20 -0
- data/vendor/plugins/active_scaffold/lib/bridges/tiny_mce/bridge.rb +5 -0
- data/vendor/plugins/active_scaffold/lib/bridges/tiny_mce/lib/tiny_mce_bridge.rb +57 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/bridge.rb +9 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/lib/form_ui.rb +14 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/lib/unobtrusive_date_picker_bridge.rb +15 -0
- data/vendor/plugins/active_scaffold/lib/bridges/unobtrusive_date_picker/lib/view_helpers.rb +16 -0
- data/vendor/plugins/active_scaffold/lib/bridges/validation_reflection/bridge.rb +9 -0
- data/vendor/plugins/active_scaffold/lib/bridges/validation_reflection/lib/validation_reflection_bridge.rb +19 -0
- data/vendor/plugins/active_scaffold/lib/extensions/action_view_rendering.rb +20 -8
- data/vendor/plugins/active_scaffold/lib/extensions/generic_view_paths.rb +2 -2
- data/vendor/plugins/active_scaffold/lib/extensions/paginator_extensions.rb +26 -0
- data/vendor/plugins/active_scaffold/lib/extensions/resources.rb +6 -5
- data/vendor/plugins/active_scaffold/lib/extensions/reverse_associations.rb +26 -20
- data/vendor/plugins/active_scaffold/lib/extensions/unsaved_associated.rb +1 -1
- data/vendor/plugins/active_scaffold/lib/paginator.rb +1 -1
- data/vendor/plugins/active_scaffold/lib/responds_to_parent.rb +1 -1
- data/vendor/plugins/active_scaffold/shoulda_macros/macros.rb +136 -0
- data/vendor/plugins/active_scaffold/test/bridges/active_scaffold_dependent_protect_test.rb +34 -0
- data/vendor/plugins/active_scaffold/test/bridges/bridge_test.rb +43 -0
- data/vendor/plugins/active_scaffold/test/bridges/company.rb +81 -0
- data/vendor/plugins/active_scaffold/test/bridges/paperclip_test.rb +68 -0
- data/vendor/plugins/active_scaffold/test/bridges/tiny_mce_test.rb +27 -0
- data/vendor/plugins/active_scaffold/test/bridges/unobtrusive_date_picker_test.rb +49 -0
- data/vendor/plugins/active_scaffold/test/bridges/validation_reflection_test.rb +57 -0
- data/vendor/plugins/active_scaffold/test/config/base_test.rb +15 -0
- data/vendor/plugins/active_scaffold/test/config/core_test.rb +58 -0
- data/vendor/plugins/active_scaffold/test/config/create_test.rb +9 -6
- data/vendor/plugins/active_scaffold/test/config/delete_test.rb +33 -0
- data/vendor/plugins/active_scaffold/test/config/field_search_test.rb +47 -0
- data/vendor/plugins/active_scaffold/test/config/list_test.rb +66 -11
- data/vendor/plugins/active_scaffold/test/config/nested_test.rb +62 -0
- data/vendor/plugins/active_scaffold/test/config/search_test.rb +60 -0
- data/vendor/plugins/active_scaffold/test/config/show_test.rb +43 -0
- data/vendor/plugins/active_scaffold/test/config/subform_test.rb +17 -0
- data/vendor/plugins/active_scaffold/test/config/update_test.rb +27 -4
- data/vendor/plugins/active_scaffold/test/data_structures/action_columns_test.rb +2 -8
- data/vendor/plugins/active_scaffold/test/data_structures/action_link_test.rb +11 -11
- data/vendor/plugins/active_scaffold/test/data_structures/action_links_test.rb +5 -5
- data/vendor/plugins/active_scaffold/test/data_structures/association_column_test.rb +4 -3
- data/vendor/plugins/active_scaffold/test/data_structures/column_test.rb +29 -5
- data/vendor/plugins/active_scaffold/test/data_structures/sorting_test.rb +31 -1
- data/vendor/plugins/active_scaffold/test/data_structures/standard_column_test.rb +3 -13
- data/vendor/plugins/active_scaffold/test/data_structures/virtual_column_test.rb +0 -11
- data/vendor/plugins/active_scaffold/test/extensions/{array.rb → array_test.rb} +0 -0
- data/vendor/plugins/active_scaffold/test/helpers/form_column_helpers_test.rb +31 -0
- data/vendor/plugins/active_scaffold/test/helpers/list_column_helpers_test.rb +42 -0
- data/vendor/plugins/active_scaffold/test/helpers/pagination_helpers_test.rb +59 -0
- data/vendor/plugins/active_scaffold/test/misc/active_record_permissions_test.rb +154 -0
- data/vendor/plugins/active_scaffold/test/misc/attribute_params_test.rb +146 -0
- data/vendor/plugins/active_scaffold/test/misc/configurable_test.rb +2 -2
- data/vendor/plugins/active_scaffold/test/misc/constraints_test.rb +26 -8
- data/vendor/plugins/active_scaffold/test/misc/finder_test.rb +41 -19
- data/vendor/plugins/active_scaffold/test/misc/lang_test.rb +5 -6
- data/vendor/plugins/active_scaffold/test/mock_app/app/controllers/application_controller.rb +10 -0
- data/vendor/plugins/active_scaffold/test/mock_app/app/helpers/application_helper.rb +3 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/boot.rb +110 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environment.rb +43 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environments/development.rb +17 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environments/production.rb +28 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/environments/test.rb +28 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/backtrace_silencers.rb +7 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/inflections.rb +10 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/mime_types.rb +5 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/new_rails_defaults.rb +19 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/initializers/session_store.rb +15 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/locales/en.yml +5 -0
- data/vendor/plugins/active_scaffold/test/mock_app/config/routes.rb +43 -0
- data/vendor/plugins/active_scaffold/test/mock_app/db/test.sqlite3 +1 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/blank.html +33 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/DO_NOT_EDIT +2 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/add.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/arrow_down.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/arrow_up.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/close.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/cross.png +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/indicator-small.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/indicator.gif +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/images/active_scaffold/default/magnifier.png +0 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/DO_NOT_EDIT +2 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/active_scaffold.js +532 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/dhtml_history.js +867 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/form_enhancements.js +117 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/javascripts/active_scaffold/default/rico_corner.js +370 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/stylesheets/active_scaffold/DO_NOT_EDIT +2 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet-ie.css +35 -0
- data/vendor/plugins/active_scaffold/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css +845 -0
- data/vendor/plugins/active_scaffold/test/model_stub.rb +17 -1
- data/vendor/plugins/active_scaffold/test/test_helper.rb +31 -5
- data/vendor/plugins/active_scaffold/uninstall.rb +2 -1
- data/vendor/plugins/active_scaffold_form_observation/init.rb +1 -1
- data/vendor/plugins/active_scaffold_form_observation/lib/active_scaffold_form_observation.rb +1 -2
- data/vendor/plugins/active_scaffold_full_refresh/init.rb +2 -0
- data/vendor/plugins/active_scaffold_full_refresh/lib/active_scaffold_full_refresh.rb +29 -0
- data/vendor/plugins/acts_as_money/{tasks → lib/tasks}/money_tasks.rake +0 -0
- metadata +668 -563
- data/app/model_views/client_accounting.rb +0 -5
- data/app/model_views/invoices_with_total.rb +0 -41
- data/app/views/admin/activities/_adjustment_column.rhtml +0 -23
- data/app/views/admin/activities_with_prices/move_to_invoice.rjs +0 -9
- data/app/views/notifier/invoice_available.html.rhtml +0 -5
- data/public/javascripts/prototype.js-1.6.0.3 +0 -4320
- data/test/functional/admin/activities_controller_test.rb +0 -8
- data/test/functional/admin/adjustments_controller_test.rb +0 -8
- data/test/functional/admin/client_accounting_controller_test.rb +0 -8
- data/test/functional/admin/client_financial_transactions_controller_test.rb +0 -8
- data/test/functional/admin/client_representatives_controller_test.rb +0 -8
- data/test/functional/admin/clients_controller_test.rb +0 -8
- data/test/functional/admin/employee_client_labor_rate_controller_test.rb +0 -8
- data/test/functional/admin/employees/slimtimer_controller_test.rb +0 -8
- data/test/functional/admin/employees_controller_test.rb +0 -8
- data/test/functional/admin/invoices_controller_test.rb +0 -8
- data/test/functional/admin/labors_controller_test.rb +0 -8
- data/test/functional/admin/materials_controller_test.rb +0 -8
- data/test/functional/admin/payments_controller_test.rb +0 -8
- data/test/functional/admin/proposals_controller_test.rb +0 -8
- data/test/functional/admin/settings_controller_test.rb +0 -8
- data/test/functional/authentication_controller_test.rb +0 -8
- data/vendor/plugins/active_scaffold/frontends/default/views/_form_association_record.html.erb +0 -27
- data/vendor/plugins/active_scaffold/frontends/default/views/_live_search.html.erb +0 -25
- data/vendor/plugins/active_scaffold/frontends/default/views/form_messages_on_create.js.rjs +0 -2
- data/vendor/plugins/active_scaffold/frontends/default/views/form_messages_on_update.js.rjs +0 -2
- data/vendor/plugins/active_scaffold/lib/active_scaffold/actions/live_search.rb +0 -46
- data/vendor/plugins/active_scaffold/lib/active_scaffold/config/live_search.rb +0 -52
- data/vendor/plugins/active_scaffold/lib/active_scaffold/locale/en.rb +0 -66
- data/vendor/plugins/active_scaffold/lib/extensions/name_option_for_datetime.rb +0 -12
- data/vendor/plugins/active_scaffold/test/misc/active_record_permissions.rb +0 -154
@@ -0,0 +1,9 @@
|
|
1
|
+
ActiveScaffold.bridge "UnobtrusiveDatePicker" do
|
2
|
+
install do
|
3
|
+
require File.join(File.dirname(__FILE__), "lib/unobtrusive_date_picker_bridge.rb")
|
4
|
+
require File.join(File.dirname(__FILE__), "lib/form_ui.rb")
|
5
|
+
require File.join(File.dirname(__FILE__), "lib/view_helpers.rb")
|
6
|
+
ActiveScaffold::Config::Core.send :include, ActiveScaffold::UnobtrusiveDatePickerBridge
|
7
|
+
ActiveScaffold::Helpers::ViewHelpers.send :include, ActiveScaffold::UnobtrusiveDatePickerHelpers
|
8
|
+
end
|
9
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
module ActiveScaffold
|
2
|
+
module Helpers
|
3
|
+
module FormColumnHelpers
|
4
|
+
def active_scaffold_input_datepicker(column, options)
|
5
|
+
method = "date#{'time' if column.column.type == :datetime}_select"
|
6
|
+
options[:include_blank] = true if column.column and column.column.null and [:date, :datetime, :time].include?(column.column.type)
|
7
|
+
html_options = options.update(column.options).delete(:html_options) || {}
|
8
|
+
options = active_scaffold_input_date_options(column, options)
|
9
|
+
args = [:record, column.name, options, html_options]
|
10
|
+
self.send(method, *args) + date_picker(*args)
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module ActiveScaffold
|
2
|
+
module UnobtrusiveDatePickerBridge
|
3
|
+
def initialize_with_unobtrusive_date_picker(model_id)
|
4
|
+
initialize_without_unobtrusive_date_picker(model_id)
|
5
|
+
date_fields = self.model.columns.select {|c| [:date, :datetime].include?(c.type) }
|
6
|
+
|
7
|
+
# automatically set the forum_ui to a file column
|
8
|
+
date_fields.each {|field| self.columns[field.name.to_sym].form_ui = :datepicker}
|
9
|
+
end
|
10
|
+
|
11
|
+
def self.included(base)
|
12
|
+
base.alias_method_chain :initialize, :unobtrusive_date_picker
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
module ActiveScaffold
|
2
|
+
module UnobtrusiveDatePickerHelpers
|
3
|
+
def self.included(base)
|
4
|
+
base.alias_method_chain :active_scaffold_stylesheets, :date_picker
|
5
|
+
base.alias_method_chain :active_scaffold_javascripts, :date_picker
|
6
|
+
end
|
7
|
+
|
8
|
+
def active_scaffold_stylesheets_with_date_picker(frontend = :default)
|
9
|
+
active_scaffold_stylesheets_without_date_picker(frontend) + unobtrusive_datepicker_stylesheets
|
10
|
+
end
|
11
|
+
|
12
|
+
def active_scaffold_javascripts_with_date_picker(frontend = :default)
|
13
|
+
active_scaffold_javascripts_without_date_picker(frontend) + unobtrusive_datepicker_javascripts
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
ActiveScaffold.bridge "ValidationReflection" do
|
2
|
+
install do
|
3
|
+
require File.join(File.dirname(__FILE__), "lib/validation_reflection_bridge.rb")
|
4
|
+
ActiveScaffold::DataStructures::Column.class_eval { include ActiveScaffold::ValidationReflectionBridge }
|
5
|
+
end
|
6
|
+
install? do
|
7
|
+
ActiveRecord::Base.respond_to? :reflect_on_validations_for
|
8
|
+
end
|
9
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
module ActiveScaffold
|
2
|
+
module ValidationReflectionBridge
|
3
|
+
def self.included(base)
|
4
|
+
base.class_eval { alias_method_chain :initialize, :validation_reflection }
|
5
|
+
end
|
6
|
+
|
7
|
+
def initialize_with_validation_reflection(name, active_record_class)
|
8
|
+
initialize_without_validation_reflection(name, active_record_class)
|
9
|
+
column_names = [name]
|
10
|
+
column_names << @association.primary_key_name if @association
|
11
|
+
self.required = column_names.any? do |column_name|
|
12
|
+
active_record_class.reflect_on_validations_for(column_name.to_sym).any? do |val|
|
13
|
+
val.macro == :validates_presence_of or (val.macro == :validates_inclusion_of and not val.options[:allow_nil] and not val.options[:allow_blank])
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
@@ -26,6 +26,7 @@ module ActionView #:nodoc:
|
|
26
26
|
if args.first == :super
|
27
27
|
options = args[1] || {}
|
28
28
|
options[:locals] ||= {}
|
29
|
+
options[:locals].reverse_merge! @local_assigns
|
29
30
|
|
30
31
|
known_extensions = [:erb, :rhtml, :rjs, :haml]
|
31
32
|
# search through call stack for a template file (normally matches on first caller)
|
@@ -33,18 +34,16 @@ module ActionView #:nodoc:
|
|
33
34
|
# solution is to count colons from the *right* of the string, not the left. see issue #299.
|
34
35
|
template_path = caller.find{|c| known_extensions.include?(c.split(':')[-3].split('.').last.to_sym) }
|
35
36
|
template = File.basename(template_path.split(':')[-3])
|
37
|
+
template, format = template.split('.')
|
36
38
|
|
37
39
|
# paths previous to current template_path must be ignored to avoid infinite loops when is called twice or more
|
38
40
|
index = 0
|
39
|
-
|
40
41
|
controller.class.active_scaffold_paths.each_with_index do |active_scaffold_template_path, i|
|
41
42
|
index = i + 1 and break if template_path.include? active_scaffold_template_path
|
42
43
|
end
|
43
44
|
|
44
|
-
controller.class.active_scaffold_paths.slice(index..-1).
|
45
|
-
|
46
|
-
return render(:file => active_scaffold_template, :locals => options[:locals]) if File.file? active_scaffold_template
|
47
|
-
end
|
45
|
+
active_scaffold_template = controller.class.active_scaffold_paths.slice(index..-1).find_template(template, format, false)
|
46
|
+
render(:file => active_scaffold_template, :locals => options[:locals])
|
48
47
|
elsif args.first.is_a?(Hash) and args.first[:active_scaffold]
|
49
48
|
require 'digest/md5'
|
50
49
|
options = args.first
|
@@ -57,7 +56,7 @@ module ActionView #:nodoc:
|
|
57
56
|
options[:params] ||= {}
|
58
57
|
options[:params].merge! :eid => eid
|
59
58
|
|
60
|
-
render_component :controller => remote_controller.to_s, :action => '
|
59
|
+
render_component :controller => remote_controller.to_s, :action => 'index', :params => options[:params]
|
61
60
|
else
|
62
61
|
render_without_active_scaffold(*args, &block)
|
63
62
|
end
|
@@ -75,9 +74,11 @@ module ActionView #:nodoc:
|
|
75
74
|
# This is the template finder logic, keep it updated with however we find stuff in rails
|
76
75
|
# currently this very similar to the logic in ActionBase::Base.render for options file
|
77
76
|
# TODO: Work with rails core team to find a better way to check for this.
|
78
|
-
def template_exists?(template_name,
|
77
|
+
def template_exists?(template_name, lookup_overrides = false)
|
79
78
|
begin
|
80
|
-
|
79
|
+
method = 'find_template'
|
80
|
+
method << '_without_active_scaffold' unless lookup_overrides
|
81
|
+
self.view_paths.send(method, template_name, @template_format)
|
81
82
|
return true
|
82
83
|
rescue ActionView::MissingTemplate => e
|
83
84
|
return false
|
@@ -85,3 +86,14 @@ module ActionView #:nodoc:
|
|
85
86
|
end
|
86
87
|
end
|
87
88
|
end
|
89
|
+
|
90
|
+
module ActionView::Renderable
|
91
|
+
def render_with_active_scaffold(view, local_assigns = {})
|
92
|
+
old_local_assigns = view.instance_variable_get(:@local_assigns)
|
93
|
+
view.instance_variable_set(:@local_assigns, local_assigns)
|
94
|
+
output = render_without_active_scaffold(view, local_assigns)
|
95
|
+
view.instance_variable_set(:@local_assigns, old_local_assigns)
|
96
|
+
output
|
97
|
+
end
|
98
|
+
alias_method_chain :render, :active_scaffold
|
99
|
+
end
|
@@ -5,10 +5,10 @@ module ActionView #:nodoc:
|
|
5
5
|
|
6
6
|
def find_template_with_active_scaffold(original_template_path, format = nil, html_fallback = true)
|
7
7
|
begin
|
8
|
-
find_template_without_active_scaffold(original_template_path, format)
|
8
|
+
find_template_without_active_scaffold(original_template_path, format, html_fallback)
|
9
9
|
rescue MissingTemplate
|
10
10
|
if active_scaffold_paths && original_template_path.include?('/')
|
11
|
-
active_scaffold_paths.find_template_without_active_scaffold(original_template_path.split('/').last, format)
|
11
|
+
active_scaffold_paths.find_template_without_active_scaffold(original_template_path.split('/').last, format, html_fallback)
|
12
12
|
else
|
13
13
|
raise
|
14
14
|
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
require 'paginator'
|
2
|
+
|
3
|
+
class Paginator
|
4
|
+
|
5
|
+
# Total number of pages
|
6
|
+
def number_of_pages_with_infinite
|
7
|
+
number_of_pages_without_infinite unless infinite?
|
8
|
+
end
|
9
|
+
alias_method_chain :number_of_pages, :infinite
|
10
|
+
|
11
|
+
# Is this an "infinite" paginator
|
12
|
+
def infinite?
|
13
|
+
@count.nil?
|
14
|
+
end
|
15
|
+
|
16
|
+
class Page
|
17
|
+
# Checks to see if there's a page after this one
|
18
|
+
def next_with_infinite?
|
19
|
+
return true if @pager.infinite?
|
20
|
+
next_without_infinite?
|
21
|
+
end
|
22
|
+
alias_method_chain :next?, :infinite
|
23
|
+
end
|
24
|
+
|
25
|
+
end
|
26
|
+
|
@@ -2,21 +2,22 @@ module ActionController
|
|
2
2
|
module Resources
|
3
3
|
class Resource
|
4
4
|
ACTIVE_SCAFFOLD_ROUTING = {
|
5
|
-
:collection => {:show_search => :get, :
|
6
|
-
:member => {:row => :get, :nested => :get, :edit_associated => :get, :add_association => :get, :update_column => :post, :destroy_existing => :delete}
|
5
|
+
:collection => {:show_search => :get, :edit_associated => :get, :list => :get, :new_existing => :get, :add_existing => :post, :render_field => :get, :mark => :put},
|
6
|
+
:member => {:row => :get, :nested => :get, :edit_associated => :get, :add_association => :get, :update_column => :post, :destroy_existing => :delete, :render_field => :get, :delete => :get, :mark => :put}
|
7
7
|
}
|
8
8
|
|
9
9
|
# by overwriting the attr_reader :options, we can parse out a special :active_scaffold flag just-in-time.
|
10
|
-
def
|
10
|
+
def options_with_active_scaffold
|
11
11
|
if @options.delete :active_scaffold
|
12
|
-
logger.
|
12
|
+
logger.debug "ActiveScaffold: extending RESTful routes for #{@plural}"
|
13
13
|
@options[:collection] ||= {}
|
14
14
|
@options[:collection].merge! ACTIVE_SCAFFOLD_ROUTING[:collection]
|
15
15
|
@options[:member] ||= {}
|
16
16
|
@options[:member].merge! ACTIVE_SCAFFOLD_ROUTING[:member]
|
17
17
|
end
|
18
|
-
|
18
|
+
options_without_active_scaffold
|
19
19
|
end
|
20
|
+
alias_method_chain :options, :active_scaffold
|
20
21
|
|
21
22
|
def logger
|
22
23
|
ActionController::Base::logger
|
@@ -7,10 +7,10 @@ module ActiveRecord
|
|
7
7
|
|
8
8
|
attr_writer :reverse
|
9
9
|
def reverse
|
10
|
-
|
11
|
-
reverse_matches = reverse_matches_for(self.class_name.constantize)
|
10
|
+
if @reverse.nil? and not self.options[:polymorphic]
|
11
|
+
reverse_matches = reverse_matches_for(self.class_name.constantize) rescue nil
|
12
12
|
# grab first association, or make a wild guess
|
13
|
-
@reverse = reverse_matches.
|
13
|
+
@reverse = reverse_matches.blank? ? false : reverse_matches.first.name
|
14
14
|
end
|
15
15
|
@reverse
|
16
16
|
end
|
@@ -22,22 +22,28 @@ module ActiveRecord
|
|
22
22
|
|
23
23
|
# stage 1 filter: collect associations that point back to this model and use the same primary_key_name
|
24
24
|
klass.reflect_on_all_associations.each do |assoc|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
#
|
31
|
-
|
32
|
-
next unless assoc.options[:
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
25
|
+
if self.options[:through]
|
26
|
+
# only iterate has_many :through associations
|
27
|
+
next unless assoc.options[:through]
|
28
|
+
next unless assoc.through_reflection.klass == self.through_reflection.klass
|
29
|
+
else
|
30
|
+
# skip over has_many :through associations
|
31
|
+
next if assoc.options[:through]
|
32
|
+
next unless assoc.options[:polymorphic] or assoc.class_name.constantize == self.active_record
|
33
|
+
|
34
|
+
case [assoc.macro, self.macro].find_all{|m| m == :has_and_belongs_to_many}.length
|
35
|
+
# if both are a habtm, then match them based on the join table
|
36
|
+
when 2
|
37
|
+
next unless assoc.options[:join_table] == self.options[:join_table]
|
38
|
+
|
39
|
+
# if only one is a habtm, they do not match
|
40
|
+
when 1
|
41
|
+
next
|
42
|
+
|
43
|
+
# otherwise, match them based on the primary_key_name
|
44
|
+
when 0
|
45
|
+
next unless assoc.primary_key_name.to_sym == self.primary_key_name.to_sym
|
46
|
+
end
|
41
47
|
end
|
42
48
|
|
43
49
|
reverse_matches << assoc
|
@@ -53,4 +59,4 @@ module ActiveRecord
|
|
53
59
|
|
54
60
|
end
|
55
61
|
end
|
56
|
-
end
|
62
|
+
end
|
@@ -48,7 +48,7 @@ class ActiveRecord::Base
|
|
48
48
|
# returns true otherwise, even when none of the associations have been instantiated. build wrapper methods accordingly.
|
49
49
|
def with_unsaved_associated
|
50
50
|
associations_for_update.all? do |association|
|
51
|
-
association_proxy =
|
51
|
+
association_proxy = send(association.name)
|
52
52
|
if association_proxy
|
53
53
|
records = association_proxy
|
54
54
|
records = [records] unless records.is_a? Array # convert singular associations into collections for ease of use
|
@@ -59,7 +59,7 @@ module RespondsToParent
|
|
59
59
|
# window.eval - legal eval for Opera
|
60
60
|
render :text => "<html><body><script type='text/javascript' charset='utf-8'>
|
61
61
|
var loc = document.location;
|
62
|
-
with(window.parent) { setTimeout(function() { window.eval('#{script}'); loc.replace('about:blank'); }, 1) }
|
62
|
+
with(window.parent) { setTimeout(function() { window.eval('#{script}'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };
|
63
63
|
</script></body></html>"
|
64
64
|
end
|
65
65
|
end
|
@@ -0,0 +1,136 @@
|
|
1
|
+
class ActiveSupport::TestCase
|
2
|
+
def self.should_have_columns_in(action, *columns)
|
3
|
+
should "have #{columns.to_sentence} columns in #{action}" do
|
4
|
+
assert_equal columns, column_names(action)
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
def self.should_include_columns_in(action, *columns)
|
9
|
+
should "include #{columns.to_sentence} columns in #{action}" do
|
10
|
+
action_columns = column_names(action)
|
11
|
+
columns.each do |column|
|
12
|
+
assert action_columns.include?(column.to_sym), "#{column} is not included in #{action}"
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
def self.should_not_include_columns_in(action, *columns)
|
18
|
+
should "not include #{columns.to_sentence} columns in #{action}" do
|
19
|
+
action_columns = column_names(action)
|
20
|
+
columns.each do |column|
|
21
|
+
assert !action_columns.include?(column.to_sym), "#{column} is included in #{action}"
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def self.should_render_as_form_ui(column_name, form_ui)
|
27
|
+
should "render column #{column_name} as #{form_ui} form_ui", :before => lambda{
|
28
|
+
@rendered_columns = []
|
29
|
+
ActionView::Base.any_instance.expects(:"active_scaffold_input_#{form_ui}").at_least_once.with {|column, options|
|
30
|
+
@rendered_columns << column.name
|
31
|
+
true
|
32
|
+
}
|
33
|
+
} do
|
34
|
+
assert_equal form_ui, @controller.active_scaffold_config.columns[column_name].form_ui
|
35
|
+
assert @rendered_columns.include?(column_name)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def self.should_render_with_options_for_select(column_name, *options)
|
40
|
+
should "render column #{column_name} with options for select" do
|
41
|
+
converting_sort = lambda{|a,b| a.to_s <=> b.to_s}
|
42
|
+
assert_equal options.sort(&converting_sort), @controller.active_scaffold_config.columns[column_name].options[:options].sort(&converting_sort)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
def self.should_render_as_form_override(column_name)
|
47
|
+
should "render column #{column_name} as form override" do
|
48
|
+
column = @controller.active_scaffold_config.columns[column_name]
|
49
|
+
assert @response.template.override_form_field?(column)
|
50
|
+
assert_template :partial => "_#{column_name}_form_column", :count => 0
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
def self.should_render_as_form_partial_override(column_name)
|
55
|
+
should "render column #{column_name} as form partial override" do
|
56
|
+
assert_template :partial => "_#{column_name}_form_column"
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
def self.should_render_as_form_hidden(column_name)
|
61
|
+
should "render column #{column_name} as form hidden", :before => lambda{
|
62
|
+
@rendered_columns = []
|
63
|
+
ActionView::Base.any_instance.expects(:"hidden_field").at_least_once.with {|object, method, options|
|
64
|
+
@rendered_columns << method
|
65
|
+
true
|
66
|
+
}
|
67
|
+
} do
|
68
|
+
assert_template :partial => "_form_hidden_attribute"
|
69
|
+
assert @rendered_columns.include?(column_name)
|
70
|
+
end
|
71
|
+
end
|
72
|
+
|
73
|
+
def self.should_render_as_list_ui(column_name, list_ui)
|
74
|
+
should "render column #{column_name} as #{list_ui} list_ui", :before => lambda{
|
75
|
+
@rendered_columns = []
|
76
|
+
ActionView::Base.any_instance.expects(:"active_scaffold_column_#{list_ui}").at_least_once.with {|column, options|
|
77
|
+
@rendered_columns << column.name
|
78
|
+
true
|
79
|
+
}
|
80
|
+
} do
|
81
|
+
assert_equal list_ui, @controller.active_scaffold_config.columns[column_name].list_ui
|
82
|
+
assert @rendered_columns.include?(column_name)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
def self.should_render_as_field_override(column_name)
|
87
|
+
should "render column #{column_name} as field override" do
|
88
|
+
column = @controller.active_scaffold_config.columns[column_name]
|
89
|
+
assert @response.template.override_form_field?(column)
|
90
|
+
assert_template :partial => "_#{column_name}_column", :count => 0
|
91
|
+
end
|
92
|
+
end
|
93
|
+
|
94
|
+
def self.should_render_as_field_partial_override(column_name)
|
95
|
+
should "render column #{column_name} as field partial override" do
|
96
|
+
assert_template :partial => "_#{column_name}_column"
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
def self.should_render_as_inplace_edit(column_name)
|
101
|
+
should "render column #{column_name} as inplace edit", :before => lambda{
|
102
|
+
@column = @controller.active_scaffold_config.columns[column_name]
|
103
|
+
@rendered_columns = []
|
104
|
+
method = @column.list_ui == :checkbox ? :format_column_checkbox : :active_scaffold_inplace_edit
|
105
|
+
ActionView::Base.any_instance.expects(method).at_least_once.with {|model, column, options|
|
106
|
+
@rendered_columns << column.name
|
107
|
+
true
|
108
|
+
}
|
109
|
+
} do
|
110
|
+
assert @column.inplace_edit
|
111
|
+
assert @rendered_columns.include?(column_name)
|
112
|
+
end
|
113
|
+
end
|
114
|
+
|
115
|
+
def self.should_respond_to_parent_redirecting_to(description, &block)
|
116
|
+
should_respond_to_parent("redirecting to #{description}") { "document.location.href = \"#{instance_eval(&block)}\"" }
|
117
|
+
end
|
118
|
+
|
119
|
+
def self.should_respond_to_parent(description = nil, &block)
|
120
|
+
should "respond to parent #{description}" do
|
121
|
+
script = block ? instance_eval(&block) : /.*/
|
122
|
+
script = script.is_a?(Regexp) ? script.source : Regexp.quote(script)
|
123
|
+
script = script.gsub('\n', '\\\\\\n').
|
124
|
+
gsub(/['"]/, '\\\\\\\\\&').
|
125
|
+
gsub('</script>','</scr"+"ipt>')
|
126
|
+
assert_select 'script[type=text/javascript]', Regexp.new('.*' + Regexp.quote("with(window.parent) { setTimeout(function() { window.eval('") + script + Regexp.quote("'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };") + '.*')
|
127
|
+
end
|
128
|
+
end
|
129
|
+
|
130
|
+
private
|
131
|
+
def column_names(action)
|
132
|
+
columns = []
|
133
|
+
@controller.active_scaffold_config.send(action).columns.each(:flatten => true) {|col| columns << col.name}
|
134
|
+
columns
|
135
|
+
end
|
136
|
+
end
|