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
@@ -1,16 +1,10 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
2
|
# require 'test/model_stub'
|
3
|
-
|
4
|
-
ActiveScaffold::DataStructures::ActionColumns.class_eval do
|
5
|
-
include Enumerable
|
6
|
-
def each
|
7
|
-
@set.each {|i| yield i}
|
8
|
-
end
|
9
|
-
end
|
3
|
+
require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
|
10
4
|
|
11
5
|
class ActionColumnsTest < Test::Unit::TestCase
|
12
6
|
def setup
|
13
|
-
@columns = ActiveScaffold::DataStructures::ActionColumns.new(:a, :b)
|
7
|
+
@columns = ActiveScaffold::DataStructures::ActionColumns.new([:a, :b])
|
14
8
|
end
|
15
9
|
|
16
10
|
def test_label
|
@@ -21,17 +21,17 @@ class ActionLinkTest < Test::Unit::TestCase
|
|
21
21
|
@link.confirm = true
|
22
22
|
assert @link.confirm
|
23
23
|
|
24
|
-
@link.
|
25
|
-
|
26
|
-
@link.
|
27
|
-
assert_equal 'hello_world_authorized?', @link.security_method
|
24
|
+
assert_equal 'bar_authorized?', @link.security_method
|
25
|
+
|
26
|
+
assert_equal false, @link.security_method_set?
|
28
27
|
@link.security_method = 'blueberry_pie'
|
28
|
+
assert_equal true, @link.security_method_set?
|
29
29
|
assert_equal 'blueberry_pie', @link.security_method
|
30
30
|
|
31
|
-
@link.type = :
|
32
|
-
assert_equal :
|
33
|
-
@link.type = :
|
34
|
-
assert_equal :
|
31
|
+
@link.type = :collection
|
32
|
+
assert_equal :collection, @link.type
|
33
|
+
@link.type = :member
|
34
|
+
assert_equal :member, @link.type
|
35
35
|
|
36
36
|
assert_equal :get, @link.method
|
37
37
|
@link.method = :put
|
@@ -41,10 +41,10 @@ class ActionLinkTest < Test::Unit::TestCase
|
|
41
41
|
def test_position
|
42
42
|
@link.position = true
|
43
43
|
|
44
|
-
@link.type = :
|
44
|
+
@link.type = :collection
|
45
45
|
assert_equal :top, @link.position
|
46
46
|
|
47
|
-
@link.type = :
|
47
|
+
@link.type = :member
|
48
48
|
assert_equal :replace, @link.position
|
49
49
|
|
50
50
|
@link.position = :before
|
@@ -75,4 +75,4 @@ class ActionLinkTest < Test::Unit::TestCase
|
|
75
75
|
assert !@link.popup?
|
76
76
|
assert !@link.page?
|
77
77
|
end
|
78
|
-
end
|
78
|
+
end
|
@@ -50,13 +50,13 @@ class ActionLinksTest < Test::Unit::TestCase
|
|
50
50
|
end
|
51
51
|
|
52
52
|
def test_each
|
53
|
-
@links.add 'foo', :type => :
|
54
|
-
@links.add 'bar', :type => :
|
53
|
+
@links.add 'foo', :type => :collection
|
54
|
+
@links.add 'bar', :type => :member
|
55
55
|
|
56
|
-
@links.each :
|
56
|
+
@links.each :collection do |link|
|
57
57
|
assert_equal 'foo', link.action
|
58
58
|
end
|
59
|
-
@links.each :
|
59
|
+
@links.each :member do |link|
|
60
60
|
assert_equal 'bar', link.action
|
61
61
|
end
|
62
62
|
end
|
@@ -75,4 +75,4 @@ class ActionLinksTest < Test::Unit::TestCase
|
|
75
75
|
end
|
76
76
|
assert !@links['bar'].nil?
|
77
77
|
end
|
78
|
-
end
|
78
|
+
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
-
|
2
|
+
require File.join(File.dirname(__FILE__), '../model_stub')
|
3
3
|
|
4
4
|
class AssociationColumnTest < Test::Unit::TestCase
|
5
5
|
def setup
|
@@ -18,8 +18,9 @@ class AssociationColumnTest < Test::Unit::TestCase
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def test_searching
|
21
|
-
#
|
22
|
-
assert
|
21
|
+
# by default searching on association columns uses primary key
|
22
|
+
assert @association_column.searchable?
|
23
|
+
assert_equal '"model_stubs"."id"', @association_column.search_sql
|
23
24
|
end
|
24
25
|
|
25
26
|
def test_association
|
@@ -1,9 +1,11 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
-
# require 'test/model_stub'
|
3
2
|
|
4
3
|
class ColumnTest < Test::Unit::TestCase
|
5
4
|
def setup
|
6
5
|
@column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
|
6
|
+
@association_col = ActiveScaffold::DataStructures::Column.new(:b, ModelStub)
|
7
|
+
@association_col.stubs(:polymorphic_association?).returns(false)
|
8
|
+
@association_col.instance_variable_set(:@association, true)
|
7
9
|
end
|
8
10
|
|
9
11
|
def test_column
|
@@ -42,7 +44,7 @@ class ColumnTest < Test::Unit::TestCase
|
|
42
44
|
end
|
43
45
|
|
44
46
|
def test_field
|
45
|
-
assert_equal 'model_stubs.a', @column.send(:field)
|
47
|
+
assert_equal '"model_stubs"."a"', @column.send(:field)
|
46
48
|
end
|
47
49
|
|
48
50
|
def test_table
|
@@ -81,6 +83,28 @@ class ColumnTest < Test::Unit::TestCase
|
|
81
83
|
assert @column != 0
|
82
84
|
end
|
83
85
|
|
86
|
+
def test_ui
|
87
|
+
assert_nil @column.form_ui
|
88
|
+
assert_nil @column.list_ui
|
89
|
+
assert_nil @column.search_ui
|
90
|
+
assert_equal :select, @association_col.search_ui
|
91
|
+
|
92
|
+
@column.form_ui = :calendar
|
93
|
+
assert_equal :calendar, @column.form_ui
|
94
|
+
assert_equal :calendar, @column.list_ui
|
95
|
+
assert_equal :calendar, @column.search_ui
|
96
|
+
|
97
|
+
@association_col.form_ui = :record_select
|
98
|
+
assert_equal :record_select, @association_col.form_ui
|
99
|
+
assert_equal :record_select, @association_col.search_ui
|
100
|
+
|
101
|
+
@column.search_ui = :record_select
|
102
|
+
@column.list_ui = :checkbox
|
103
|
+
assert_equal :calendar, @column.form_ui
|
104
|
+
assert_equal :checkbox, @column.list_ui
|
105
|
+
assert_equal :record_select, @column.search_ui
|
106
|
+
end
|
107
|
+
|
84
108
|
def test_searchable
|
85
109
|
@column.search_sql = nil
|
86
110
|
assert !@column.searchable?
|
@@ -97,7 +121,7 @@ class ColumnTest < Test::Unit::TestCase
|
|
97
121
|
|
98
122
|
def test_custom_search
|
99
123
|
@column.search_sql = true
|
100
|
-
assert_equal 'model_stubs.a', @column.search_sql
|
124
|
+
assert_equal '"model_stubs"."a"', @column.search_sql
|
101
125
|
@column.search_sql = 'foobar'
|
102
126
|
assert_equal 'foobar', @column.search_sql
|
103
127
|
assert @column.searchable?
|
@@ -105,7 +129,7 @@ class ColumnTest < Test::Unit::TestCase
|
|
105
129
|
|
106
130
|
def test_custom_sort
|
107
131
|
@column.sort = true
|
108
|
-
hash = {:sql => 'model_stubs.a'}
|
132
|
+
hash = {:sql => '"model_stubs"."a"'}
|
109
133
|
assert_equal hash, @column.sort
|
110
134
|
@column.sort_by :sql => 'foobar'
|
111
135
|
hash = {:sql => 'foobar'}
|
@@ -158,4 +182,4 @@ class ColumnTest < Test::Unit::TestCase
|
|
158
182
|
@column.includes = [:column_name]
|
159
183
|
assert_equal([:column_name], @column.includes)
|
160
184
|
end
|
161
|
-
end
|
185
|
+
end
|
@@ -93,4 +93,34 @@ class SortingTest < Test::Unit::TestCase
|
|
93
93
|
@sorting.add :b
|
94
94
|
assert !@sorting.sorts_by_method?
|
95
95
|
end
|
96
|
-
|
96
|
+
|
97
|
+
def test_build_order_clause
|
98
|
+
assert @sorting.clause.nil?
|
99
|
+
|
100
|
+
@sorting << [:a, 'desc']
|
101
|
+
@sorting << [:b, 'asc']
|
102
|
+
|
103
|
+
assert_equal '"model_stubs"."a" DESC, "model_stubs"."b" ASC', @sorting.clause
|
104
|
+
end
|
105
|
+
|
106
|
+
def test_set_default_sorting_with_simple_default_scope
|
107
|
+
model_stub_with_default_scope = ModelStub.clone
|
108
|
+
model_stub_with_default_scope.class_eval { default_scope :order => 'a' }
|
109
|
+
@sorting.set_default_sorting model_stub_with_default_scope
|
110
|
+
|
111
|
+
assert @sorting.sorts_on?(:a)
|
112
|
+
assert_equal 'ASC', @sorting.direction_of(:a)
|
113
|
+
assert_nil @sorting.clause
|
114
|
+
end
|
115
|
+
|
116
|
+
def test_set_default_sorting_with_complex_default_scope
|
117
|
+
model_stub_with_default_scope = ModelStub.clone
|
118
|
+
model_stub_with_default_scope.class_eval { default_scope :order => 'a DESC, players.last_name ASC' }
|
119
|
+
@sorting.set_default_sorting model_stub_with_default_scope
|
120
|
+
|
121
|
+
assert @sorting.sorts_on?(:a)
|
122
|
+
assert_equal 'DESC', @sorting.direction_of(:a)
|
123
|
+
assert_equal 1, @sorting.instance_variable_get(:@clauses).size
|
124
|
+
assert_nil @sorting.clause
|
125
|
+
end
|
126
|
+
end
|
@@ -1,16 +1,6 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
2
|
# require 'test/model_stub'
|
3
3
|
|
4
|
-
class ActiveScaffold::DataStructures::Column
|
5
|
-
def h(value)
|
6
|
-
value
|
7
|
-
end
|
8
|
-
|
9
|
-
def format_column(value)
|
10
|
-
value
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
4
|
class StandardColumnTest < Test::Unit::TestCase
|
15
5
|
def setup
|
16
6
|
@standard_column = ActiveScaffold::DataStructures::Column.new(ModelStub.columns.first.name, ModelStub)
|
@@ -22,13 +12,13 @@ class StandardColumnTest < Test::Unit::TestCase
|
|
22
12
|
end
|
23
13
|
|
24
14
|
def test_sorting
|
25
|
-
hash = {:sql => 'model_stubs.a'}
|
15
|
+
hash = {:sql => '"model_stubs"."a"'}
|
26
16
|
assert @standard_column.sortable?
|
27
17
|
assert_equal hash, @standard_column.sort # check default
|
28
18
|
end
|
29
19
|
|
30
20
|
def test_searching
|
31
21
|
assert @standard_column.searchable?
|
32
|
-
assert_equal 'model_stubs.a', @standard_column.search_sql # check default
|
22
|
+
assert_equal '"model_stubs"."a"', @standard_column.search_sql # check default
|
33
23
|
end
|
34
|
-
end
|
24
|
+
end
|
@@ -1,15 +1,4 @@
|
|
1
1
|
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
-
# require 'test/model_stub'
|
3
|
-
|
4
|
-
class ActiveScaffold::DataStructures::Column
|
5
|
-
def h(value)
|
6
|
-
value
|
7
|
-
end
|
8
|
-
|
9
|
-
def format_column(value)
|
10
|
-
value
|
11
|
-
end
|
12
|
-
end
|
13
2
|
|
14
3
|
class VirtualColumnTest < Test::Unit::TestCase
|
15
4
|
def setup
|
File without changes
|
@@ -0,0 +1,31 @@
|
|
1
|
+
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
+
|
3
|
+
class FormColumnHelpersTest < ActionView::TestCase
|
4
|
+
include ActiveScaffold::Helpers::FormColumnHelpers
|
5
|
+
|
6
|
+
def setup
|
7
|
+
@column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
|
8
|
+
@record = stub(:a => nil)
|
9
|
+
end
|
10
|
+
|
11
|
+
def test_choices_for_select_form_ui_for_simple_column
|
12
|
+
@column.options[:options] = [:value_1, :value_2, :value_3]
|
13
|
+
assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">Value 1</option><option value="value_2">Value 2</option><option value="value_3">Value 3</option></select>', active_scaffold_input_select(@column, {})
|
14
|
+
|
15
|
+
@column.options[:options] = %w(value_1 value_2 value_3)
|
16
|
+
assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">value_1</option><option value="value_2">value_2</option><option value="value_3">value_3</option></select>', active_scaffold_input_select(@column, {})
|
17
|
+
|
18
|
+
@column.options[:options] = [%w(text_1 value_1), %w(text_2 value_2), %w(text_3 value_3)]
|
19
|
+
assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">text_1</option><option value="value_2">text_2</option><option value="value_3">text_3</option></select>', active_scaffold_input_select(@column, {})
|
20
|
+
|
21
|
+
@column.options[:options] = [[:text_1, :value_1], [:text_2, :value_2], [:text_3, :value_3]]
|
22
|
+
assert_dom_equal '<select name="record[a]" id="record_a"><option value="value_1">Text 1</option><option value="value_2">Text 2</option><option value="value_3">Text 3</option></select>', active_scaffold_input_select(@column, {})
|
23
|
+
end
|
24
|
+
|
25
|
+
def test_options_for_select_form_ui_for_simple_column
|
26
|
+
@column.options = {:include_blank => 'None', :selected => 'value_2', :disabled => %w(value_1 value_3)}
|
27
|
+
@column.options[:options] = %w(value_1 value_2 value_3)
|
28
|
+
@column.options[:html_options] = {:class => 'big'}
|
29
|
+
assert_dom_equal '<select name="record[a]" class="big" id="record_a"><option value="">None</option><option disabled="disabled" value="value_1">value_1</option><option selected="selected" value="value_2">value_2</option><option disabled="disabled" value="value_3">value_3</option></select>', active_scaffold_input_select(@column, {})
|
30
|
+
end
|
31
|
+
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
+
|
3
|
+
class ListColumnHelpersTest < ActionView::TestCase
|
4
|
+
include ActiveScaffold::Helpers::ListColumnHelpers
|
5
|
+
include ActiveScaffold::Helpers::ViewHelpers
|
6
|
+
|
7
|
+
def setup
|
8
|
+
@column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
|
9
|
+
@column.form_ui = :select
|
10
|
+
@record = stub(:a => 'value_2')
|
11
|
+
@config = stub(:list => stub(:empty_field_text => '-', :association_join_text => ', '))
|
12
|
+
@association_column = ActiveScaffold::DataStructures::Column.new(:b, ModelStub)
|
13
|
+
@association_column.stubs(:association).returns(stub(:macro => :has_many))
|
14
|
+
end
|
15
|
+
|
16
|
+
def test_options_for_select_list_ui_for_simple_column
|
17
|
+
@column.options[:options] = [:value_1, :value_2, :value_3]
|
18
|
+
assert_equal 'Value 2', format_column_value(@record, @column)
|
19
|
+
|
20
|
+
@column.options[:options] = %w(value_1 value_2 value_3)
|
21
|
+
assert_equal 'value_2', format_column_value(@record, @column)
|
22
|
+
|
23
|
+
@column.options[:options] = [%w(text_1 value_1), %w(text_2 value_2), %w(text_3 value_3)]
|
24
|
+
assert_equal 'text_2', format_column_value(@record, @column)
|
25
|
+
|
26
|
+
@column.options[:options] = [[:text_1, :value_1], [:text_2, :value_2], [:text_3, :value_3]]
|
27
|
+
assert_equal 'Text 2', format_column_value(@record, @column)
|
28
|
+
end
|
29
|
+
|
30
|
+
def test_association_join_text
|
31
|
+
value = [1, 2, 3, 4].map(&:to_s)
|
32
|
+
value.each {|v| v.stubs(:to_label).returns(v)}
|
33
|
+
assert_equal '1, 2, 3, … (4)', format_association_value(value, @association_column, value.size)
|
34
|
+
@config.list.stubs(:association_join_text => ',<br/>')
|
35
|
+
assert_equal '1,<br/>2,<br/>3,<br/>… (4)', format_association_value(value, @association_column, value.size)
|
36
|
+
end
|
37
|
+
|
38
|
+
private
|
39
|
+
def active_scaffold_config
|
40
|
+
@config
|
41
|
+
end
|
42
|
+
end
|
@@ -0,0 +1,59 @@
|
|
1
|
+
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
+
|
3
|
+
class PaginationHelpersTest < Test::Unit::TestCase
|
4
|
+
include ActiveScaffold::Helpers::PaginationHelpers
|
5
|
+
|
6
|
+
def test_links
|
7
|
+
self.stubs(:pagination_ajax_link).returns('l')
|
8
|
+
|
9
|
+
assert_equal '1', links(1, 1)
|
10
|
+
assert_equal '1 l', links(1, 2)
|
11
|
+
assert_equal '1 l l', links(1, 3)
|
12
|
+
assert_equal '1 l l l', links(1, 4)
|
13
|
+
assert_equal '1 l l .. l', links(1, 5)
|
14
|
+
assert_equal '1 l l .. l', links(1, 6)
|
15
|
+
|
16
|
+
assert_equal 'l 2 l l .. l', links(2, 10)
|
17
|
+
assert_equal 'l l 3 l l .. l', links(3, 10)
|
18
|
+
assert_equal 'l l l 4 l l .. l', links(4, 10)
|
19
|
+
assert_equal 'l .. l l 5 l l .. l', links(5, 10)
|
20
|
+
assert_equal 'l .. l l 6 l l .. l', links(6, 10)
|
21
|
+
|
22
|
+
assert_equal '1 l l l l', links(1, 5, 3)
|
23
|
+
assert_equal '1 l l l .. l', links(1, 6, 3)
|
24
|
+
assert_equal 'l l l l 5 l l l .. l', links(5, 10, 3)
|
25
|
+
assert_equal 'l .. l l l 6 l l l l', links(6, 10, 3)
|
26
|
+
assert_equal 'l .. l l l 6 l l l .. l', links(6, 20, 3)
|
27
|
+
end
|
28
|
+
|
29
|
+
def test_links_with_infinite_pagination
|
30
|
+
self.stubs(:pagination_ajax_link).returns('l')
|
31
|
+
|
32
|
+
assert_equal '1 l l .. l .. l', links(1, nil, 2, true)
|
33
|
+
assert_equal 'l 2 l l .. l .. l', links(2, nil, 2, true)
|
34
|
+
assert_equal 'l l 3 l l .. l .. l', links(3, nil, 2, true)
|
35
|
+
assert_equal 'l l l 4 l l .. l .. l', links(4, nil, 2, true)
|
36
|
+
assert_equal 'l .. l l 5 l l .. l .. l', links(5, nil, 2, true)
|
37
|
+
|
38
|
+
assert_equal 'l .. l l 20 l l .. l .. l', links(20, nil, 2, true)
|
39
|
+
assert_equal 'l .. l l 21 l l .. l .. l', links(21, nil, 2, true)
|
40
|
+
assert_equal 'l l .. l l 22 l l .. l .. l', links(22, nil, 2, true)
|
41
|
+
assert_equal 'l .. l .. l l 23 l l .. l .. l', links(23, nil, 2, true)
|
42
|
+
|
43
|
+
assert_equal 'l .. l .. l l 100 l l .. l .. l', links(100, nil, 2, true)
|
44
|
+
assert_equal 'l .. l .. l l 101 l l .. l .. l', links(101, nil, 2, true)
|
45
|
+
assert_equal 'l l .. l .. l l 102 l l .. l .. l', links(102, nil, 2, true)
|
46
|
+
assert_equal 'l .. l .. l .. l l 103 l l .. l .. l', links(103, nil, 2, true)
|
47
|
+
end
|
48
|
+
|
49
|
+
private
|
50
|
+
def links(current, last_page, window_size = 2, infinite = false)
|
51
|
+
paginator = stub(:last => last_page = stub(:number => last_page), :infinite? => infinite)
|
52
|
+
current_page = stub(:number => current, :pager => paginator)
|
53
|
+
pagination_ajax_links(current_page, {}, window_size)
|
54
|
+
end
|
55
|
+
|
56
|
+
def content_tag(tag, text)
|
57
|
+
text
|
58
|
+
end
|
59
|
+
end
|
@@ -0,0 +1,154 @@
|
|
1
|
+
require File.join(File.dirname(__FILE__), '../test_helper.rb')
|
2
|
+
|
3
|
+
class PermissionModel < ActiveRecord::Base
|
4
|
+
def self.columns; [] end
|
5
|
+
|
6
|
+
def authorized_for_read?; true; end
|
7
|
+
def authorized_for_update?; false; end
|
8
|
+
#def authorized_for_create?; end
|
9
|
+
|
10
|
+
def a1_authorized?; true; end
|
11
|
+
def a2_authorized?; false; end
|
12
|
+
#def a3_authorized?; end
|
13
|
+
|
14
|
+
def b1_authorized?; true; end
|
15
|
+
def b2_authorized?; false; end
|
16
|
+
#def b3_authorized?; end
|
17
|
+
|
18
|
+
def c1_authorized?; true; end
|
19
|
+
def c2_authorized?; false; end
|
20
|
+
#def c3_authorized?; end
|
21
|
+
|
22
|
+
def a3_authorized_for_create?; true; end
|
23
|
+
def b3_authorized_for_create?; false; end
|
24
|
+
#def c3_authorized_for_create?; end
|
25
|
+
def a2_authorized_for_create?; true; end
|
26
|
+
def b2_authorized_for_create?; false; end
|
27
|
+
#def c2_authorized_for_create?; end
|
28
|
+
def a1_authorized_for_create?; true; end
|
29
|
+
def b1_authorized_for_create?; false; end
|
30
|
+
#def c1_authorized_for_create?; end
|
31
|
+
|
32
|
+
def a3_authorized_for_read?; true; end
|
33
|
+
def b3_authorized_for_read?; false; end
|
34
|
+
#def c3_authorized_for_read?; end
|
35
|
+
def a2_authorized_for_read?; true; end
|
36
|
+
def b2_authorized_for_read?; false; end
|
37
|
+
#def c2_authorized_for_read?; end
|
38
|
+
def a1_authorized_for_read?; true; end
|
39
|
+
def b1_authorized_for_read?; false; end
|
40
|
+
#def c1_authorized_for_read?; end
|
41
|
+
|
42
|
+
def a3_authorized_for_update?; true; end
|
43
|
+
def b3_authorized_for_update?; false; end
|
44
|
+
#def c3_authorized_for_update?; end
|
45
|
+
def a2_authorized_for_update?; true; end
|
46
|
+
def b2_authorized_for_update?; false; end
|
47
|
+
#def c2_authorized_for_update?; end
|
48
|
+
def a1_authorized_for_update?; true; end
|
49
|
+
def b1_authorized_for_update?; false; end
|
50
|
+
#def c1_authorized_for_update?; end
|
51
|
+
end
|
52
|
+
|
53
|
+
class ActiveRecordPermissionsTest < Test::Unit::TestCase
|
54
|
+
def setup
|
55
|
+
@model = PermissionModel.new
|
56
|
+
end
|
57
|
+
|
58
|
+
# Combinations Legend:
|
59
|
+
# columns are: crud_type method, column method, crud_type/column method
|
60
|
+
# symbols are: is (a)bsent, returns (f)alse, returns (t)rue, or n/a (_)
|
61
|
+
def test_method_combinations_with_default_true
|
62
|
+
ActiveRecordPermissions.default_permission = true
|
63
|
+
|
64
|
+
pass(@model.authorized_for?(:column => :a3), '_a_')
|
65
|
+
fail(@model.authorized_for?(:column => :a2), '_f_')
|
66
|
+
pass(@model.authorized_for?(:column => :a1), '_t_')
|
67
|
+
|
68
|
+
pass(@model.authorized_for?(:crud_type => :create), 'a__')
|
69
|
+
fail(@model.authorized_for?(:crud_type => :update), 'f__')
|
70
|
+
pass(@model.authorized_for?(:crud_type => :read), 't__')
|
71
|
+
|
72
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :c3), 'aaa')
|
73
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :b3), 'aaf')
|
74
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :a3), 'aat')
|
75
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :c2), 'afa')
|
76
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :b2), 'aff')
|
77
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :a2), 'aft')
|
78
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :c1), 'ata')
|
79
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :b1), 'atf')
|
80
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :a1), 'att')
|
81
|
+
|
82
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :c3), 'faa')
|
83
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :b3), 'faf')
|
84
|
+
pass(@model.authorized_for?(:crud_type => :update, :column => :a3), 'fat')
|
85
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :c2), 'ffa')
|
86
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :b2), 'fff')
|
87
|
+
pass(@model.authorized_for?(:crud_type => :update, :column => :a2), 'fft')
|
88
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :c1), 'fta')
|
89
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :b1), 'ftf')
|
90
|
+
pass(@model.authorized_for?(:crud_type => :update, :column => :a1), 'ftt')
|
91
|
+
|
92
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :c3), 'taa')
|
93
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :b3), 'taf')
|
94
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :a3), 'tat')
|
95
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :c2), 'tfa')
|
96
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :b2), 'tff')
|
97
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :a2), 'tft')
|
98
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :c1), 'tta')
|
99
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :b1), 'ttf')
|
100
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :a1), 'ttt')
|
101
|
+
end
|
102
|
+
|
103
|
+
def test_method_combinations_with_default_false
|
104
|
+
ActiveRecordPermissions.default_permission = false
|
105
|
+
|
106
|
+
fail(@model.authorized_for?(:column => :a3), '_a_')
|
107
|
+
fail(@model.authorized_for?(:column => :a2), '_f_')
|
108
|
+
pass(@model.authorized_for?(:column => :a1), '_t_')
|
109
|
+
|
110
|
+
fail(@model.authorized_for?(:crud_type => :create), 'a__')
|
111
|
+
fail(@model.authorized_for?(:crud_type => :update), 'f__')
|
112
|
+
pass(@model.authorized_for?(:crud_type => :read), 't__')
|
113
|
+
|
114
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :c3), 'aaa')
|
115
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :b3), 'aaf')
|
116
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :a3), 'aat')
|
117
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :c2), 'afa')
|
118
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :b2), 'aff')
|
119
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :a2), 'aft')
|
120
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :c1), 'ata')
|
121
|
+
fail(@model.authorized_for?(:crud_type => :create, :column => :b1), 'atf')
|
122
|
+
pass(@model.authorized_for?(:crud_type => :create, :column => :a1), 'att')
|
123
|
+
|
124
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :c3), 'faa')
|
125
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :b3), 'faf')
|
126
|
+
pass(@model.authorized_for?(:crud_type => :update, :column => :a3), 'fat')
|
127
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :c2), 'ffa')
|
128
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :b2), 'fff')
|
129
|
+
pass(@model.authorized_for?(:crud_type => :update, :column => :a2), 'fft')
|
130
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :c1), 'fta')
|
131
|
+
fail(@model.authorized_for?(:crud_type => :update, :column => :b1), 'ftf')
|
132
|
+
pass(@model.authorized_for?(:crud_type => :update, :column => :a1), 'ftt')
|
133
|
+
|
134
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :c3), 'taa')
|
135
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :b3), 'taf')
|
136
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :a3), 'tat')
|
137
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :c2), 'tfa')
|
138
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :b2), 'tff')
|
139
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :a2), 'tft')
|
140
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :c1), 'tta')
|
141
|
+
fail(@model.authorized_for?(:crud_type => :read, :column => :b1), 'ttf')
|
142
|
+
pass(@model.authorized_for?(:crud_type => :read, :column => :a1), 'ttt')
|
143
|
+
end
|
144
|
+
|
145
|
+
private
|
146
|
+
|
147
|
+
def pass(value, message = nil)
|
148
|
+
assert value, "#{message} should pass"
|
149
|
+
end
|
150
|
+
|
151
|
+
def fail(value, message = nil)
|
152
|
+
assert !value, "#{message} should fail"
|
153
|
+
end
|
154
|
+
end
|