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
@@ -3,16 +3,20 @@ module ActiveScaffold::Config
|
|
3
3
|
include ActiveScaffold::Configurable
|
4
4
|
extend ActiveScaffold::Configurable
|
5
5
|
|
6
|
+
def initialize(core_config)
|
7
|
+
@core = core_config
|
8
|
+
end
|
9
|
+
|
6
10
|
def self.inherited(subclass)
|
7
11
|
class << subclass
|
8
|
-
# the crud type of the action. possible values are :create, :read, :update, :
|
12
|
+
# the crud type of the action. possible values are :create, :read, :update, :delete, and nil.
|
9
13
|
# this is not a setting for the developer. it's self-description for the actions.
|
10
14
|
def crud_type; @crud_type; end
|
11
15
|
|
12
16
|
protected
|
13
17
|
|
14
18
|
def crud_type=(val)
|
15
|
-
raise ArgumentError, "unknown CRUD type #{val}" unless [:create, :read, :update, :
|
19
|
+
raise ArgumentError, "unknown CRUD type #{val}" unless [:create, :read, :update, :delete].include?(val.to_sym)
|
16
20
|
@crud_type = val.to_sym
|
17
21
|
end
|
18
22
|
end
|
@@ -20,6 +24,10 @@ module ActiveScaffold::Config
|
|
20
24
|
# delegate
|
21
25
|
def crud_type; self.class.crud_type end
|
22
26
|
|
27
|
+
def label(model = nil)
|
28
|
+
as_(@label, :model => model || @core.label(:count => 1))
|
29
|
+
end
|
30
|
+
|
23
31
|
# the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
|
24
32
|
attr_accessor :user
|
25
33
|
|
@@ -33,5 +41,22 @@ module ActiveScaffold::Config
|
|
33
41
|
@conf = conf
|
34
42
|
end
|
35
43
|
end
|
44
|
+
|
45
|
+
def formats
|
46
|
+
@formats ||= []
|
47
|
+
end
|
48
|
+
|
49
|
+
def formats=(val)
|
50
|
+
@formats=val
|
51
|
+
end
|
52
|
+
|
53
|
+
private
|
54
|
+
|
55
|
+
def columns=(val)
|
56
|
+
@columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
|
57
|
+
@columns.action = self
|
58
|
+
@columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)
|
59
|
+
@columns
|
60
|
+
end
|
36
61
|
end
|
37
|
-
end
|
62
|
+
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
module ActiveScaffold::Config
|
2
|
-
class Core < Base
|
2
|
+
class Core < ActiveScaffold::Config::Base
|
3
3
|
# global level configuration
|
4
4
|
# --------------------------
|
5
5
|
|
@@ -53,6 +53,9 @@ module ActiveScaffold::Config
|
|
53
53
|
end
|
54
54
|
@@ignore_columns = ActiveScaffold::DataStructures::Set.new
|
55
55
|
|
56
|
+
# lets you specify whether add a create link for each sti child
|
57
|
+
cattr_accessor :sti_create_links
|
58
|
+
|
56
59
|
# instance-level configuration
|
57
60
|
# ----------------------------
|
58
61
|
|
@@ -76,16 +79,24 @@ module ActiveScaffold::Config
|
|
76
79
|
# lets you override the global ActiveScaffold theme for a specific controller
|
77
80
|
attr_accessor :theme
|
78
81
|
|
82
|
+
# lets you specify whether add a create link for each sti child for a specific controller
|
83
|
+
attr_accessor :sti_create_links
|
84
|
+
def add_sti_create_links?
|
85
|
+
self.sti_create_links and not self.sti_children.nil?
|
86
|
+
end
|
87
|
+
|
79
88
|
# action links are used by actions to tie together. they appear as links for each record, or general links for the ActiveScaffold.
|
80
89
|
attr_reader :action_links
|
81
90
|
|
82
91
|
# a generally-applicable name for this ActiveScaffold ... will be used for generating page/section headers
|
83
92
|
attr_writer :label
|
84
93
|
def label(options={})
|
85
|
-
options[:count]
|
86
|
-
as_(@label, options) || model.human_name(options)
|
94
|
+
as_(@label, options) || model.human_name(options.merge(:default => options[:count].to_i == 1 ? model.name : model.name.pluralize))
|
87
95
|
end
|
88
96
|
|
97
|
+
# STI children models, use an array of model names
|
98
|
+
attr_accessor :sti_children
|
99
|
+
|
89
100
|
##
|
90
101
|
## internal usage only below this point
|
91
102
|
## ------------------------------------
|
@@ -110,6 +121,7 @@ module ActiveScaffold::Config
|
|
110
121
|
# inherit the global frontend
|
111
122
|
@frontend = self.class.frontend
|
112
123
|
@theme = self.class.theme
|
124
|
+
@sti_create_links = self.class.sti_create_links
|
113
125
|
|
114
126
|
# inherit from the global set of action links
|
115
127
|
@action_links = self.class.action_links.clone
|
@@ -127,6 +139,34 @@ module ActiveScaffold::Config
|
|
127
139
|
end
|
128
140
|
end
|
129
141
|
|
142
|
+
# To be called after your finished configuration
|
143
|
+
def _configure_sti
|
144
|
+
column = self.model.inheritance_column
|
145
|
+
if sti_create_links
|
146
|
+
self.columns[column].form_ui ||= :hidden
|
147
|
+
else
|
148
|
+
self.columns[column].form_ui ||= :select
|
149
|
+
self.columns[column].options ||= {}
|
150
|
+
self.columns[column].options[:options] = self.sti_children.collect do |model_name|
|
151
|
+
[model_name.to_s.camelize.constantize.human_name, model_name.to_s.camelize]
|
152
|
+
end
|
153
|
+
end
|
154
|
+
end
|
155
|
+
|
156
|
+
# To be called after include action modules
|
157
|
+
def _add_sti_create_links
|
158
|
+
new_action_link = @action_links['new']
|
159
|
+
unless new_action_link.nil?
|
160
|
+
@action_links.delete('new')
|
161
|
+
self.sti_children.each do |child|
|
162
|
+
new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
|
163
|
+
new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.human_name)
|
164
|
+
new_sti_link.parameters = {model.inheritance_column => child}
|
165
|
+
@action_links.add(new_sti_link)
|
166
|
+
end
|
167
|
+
end
|
168
|
+
end
|
169
|
+
|
130
170
|
# configuration routing.
|
131
171
|
# we want to route calls named like an activated action to that action's global or local Config class.
|
132
172
|
# ---------------------------
|
@@ -1,10 +1,11 @@
|
|
1
1
|
module ActiveScaffold::Config
|
2
|
-
class Create < Form
|
2
|
+
class Create < ActiveScaffold::Config::Form
|
3
3
|
self.crud_type = :create
|
4
|
-
def initialize(
|
4
|
+
def initialize(core_config)
|
5
5
|
super
|
6
|
+
@label = :create_model
|
6
7
|
self.persistent = self.class.persistent
|
7
|
-
self.
|
8
|
+
self.action_after_create = self.class.action_after_create
|
8
9
|
end
|
9
10
|
|
10
11
|
# global level configuration
|
@@ -16,28 +17,20 @@ module ActiveScaffold::Config
|
|
16
17
|
def self.link=(val)
|
17
18
|
@@link = val
|
18
19
|
end
|
19
|
-
@@link = ActiveScaffold::DataStructures::ActionLink.new('new', :label => :create_new, :type => :
|
20
|
+
@@link = ActiveScaffold::DataStructures::ActionLink.new('new', :label => :create_new, :type => :collection, :security_method => :create_authorized?)
|
20
21
|
|
21
22
|
# whether the form stays open after a create or not
|
22
23
|
cattr_accessor :persistent
|
23
24
|
@@persistent = false
|
24
25
|
|
25
26
|
# whether update form is opened after a create or not
|
26
|
-
cattr_accessor :
|
27
|
-
@@
|
28
|
-
|
29
|
-
# instance-level configuration
|
30
|
-
# ----------------------------
|
31
|
-
# the label= method already exists in the Form base class
|
32
|
-
def label
|
33
|
-
@label ? as_(@label) : as_(:create_model, :model => @core.label(:count => 1))
|
34
|
-
end
|
27
|
+
cattr_accessor :action_after_create
|
28
|
+
@@action_after_create = nil
|
35
29
|
|
36
30
|
# whether the form stays open after a create or not
|
37
31
|
attr_accessor :persistent
|
38
32
|
|
39
33
|
# whether the form stays open after a create or not
|
40
|
-
attr_accessor :
|
41
|
-
|
34
|
+
attr_accessor :action_after_create
|
42
35
|
end
|
43
36
|
end
|
@@ -1,10 +1,9 @@
|
|
1
1
|
module ActiveScaffold::Config
|
2
2
|
class Delete < Base
|
3
|
-
self.crud_type = :
|
3
|
+
self.crud_type = :delete
|
4
4
|
|
5
5
|
def initialize(core_config)
|
6
|
-
|
7
|
-
|
6
|
+
super
|
8
7
|
# start with the ActionLink defined globally
|
9
8
|
@link = self.class.link.clone
|
10
9
|
end
|
@@ -14,7 +13,7 @@ module ActiveScaffold::Config
|
|
14
13
|
|
15
14
|
# the ActionLink for this action
|
16
15
|
cattr_accessor :link
|
17
|
-
@@link = ActiveScaffold::DataStructures::ActionLink.new('
|
16
|
+
@@link = ActiveScaffold::DataStructures::ActionLink.new('delete', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :crud_type => :delete, :method => :delete, :position => false, :security_method => :delete_authorized?)
|
18
17
|
|
19
18
|
# instance-level configuration
|
20
19
|
# ----------------------------
|
@@ -3,9 +3,8 @@ module ActiveScaffold::Config
|
|
3
3
|
self.crud_type = :read
|
4
4
|
|
5
5
|
def initialize(core_config)
|
6
|
-
|
7
|
-
|
8
|
-
@full_text_search = self.class.full_text_search?
|
6
|
+
super
|
7
|
+
@text_search = self.class.text_search
|
9
8
|
|
10
9
|
# start with the ActionLink defined globally
|
11
10
|
@link = self.class.link.clone
|
@@ -16,13 +15,16 @@ module ActiveScaffold::Config
|
|
16
15
|
# --------------------------
|
17
16
|
# the ActionLink for this action
|
18
17
|
cattr_reader :link
|
19
|
-
@@link = ActiveScaffold::DataStructures::ActionLink.new('show_search', :label => :search, :type => :
|
18
|
+
@@link = ActiveScaffold::DataStructures::ActionLink.new('show_search', :label => :search, :type => :collection, :security_method => :search_authorized?)
|
20
19
|
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
end
|
25
|
-
|
20
|
+
# A flag for how the search should do full-text searching in the database:
|
21
|
+
# * :full: LIKE %?%
|
22
|
+
# * :start: LIKE ?%
|
23
|
+
# * :end: LIKE %?
|
24
|
+
# * false: LIKE ?
|
25
|
+
# Default is :full
|
26
|
+
cattr_accessor :text_search
|
27
|
+
@@text_search = :full
|
26
28
|
|
27
29
|
# instance-level configuration
|
28
30
|
# ----------------------------
|
@@ -37,15 +39,15 @@ module ActiveScaffold::Config
|
|
37
39
|
@columns
|
38
40
|
end
|
39
41
|
|
40
|
-
|
41
|
-
@columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
|
42
|
-
@columns.action = self
|
43
|
-
end
|
42
|
+
public :columns=
|
44
43
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
end
|
44
|
+
# A flag for how the search should do full-text searching in the database:
|
45
|
+
# * :full: LIKE %?%
|
46
|
+
# * :start: LIKE ?%
|
47
|
+
# * :end: LIKE %?
|
48
|
+
# * false: LIKE ?
|
49
|
+
# Default is :full
|
50
|
+
attr_accessor :text_search
|
49
51
|
|
50
52
|
# the ActionLink for this action
|
51
53
|
attr_accessor :link
|
@@ -1,8 +1,7 @@
|
|
1
1
|
module ActiveScaffold::Config
|
2
2
|
class Form < Base
|
3
3
|
def initialize(core_config)
|
4
|
-
|
5
|
-
|
4
|
+
super
|
6
5
|
# start with the ActionLink defined globally
|
7
6
|
@link = self.class.link.clone
|
8
7
|
|
@@ -21,9 +20,6 @@ module ActiveScaffold::Config
|
|
21
20
|
|
22
21
|
# the label for this Form action. used for the header.
|
23
22
|
attr_writer :label
|
24
|
-
def label
|
25
|
-
as_(@label)
|
26
|
-
end
|
27
23
|
|
28
24
|
# provides access to the list of columns specifically meant for the Form to use
|
29
25
|
def columns
|
@@ -35,10 +31,7 @@ module ActiveScaffold::Config
|
|
35
31
|
@columns
|
36
32
|
end
|
37
33
|
|
38
|
-
|
39
|
-
@columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
|
40
|
-
@columns.action = self
|
41
|
-
end
|
34
|
+
public :columns=
|
42
35
|
|
43
36
|
# whether the form should be multipart
|
44
37
|
attr_writer :multipart
|
@@ -3,18 +3,22 @@ module ActiveScaffold::Config
|
|
3
3
|
self.crud_type = :read
|
4
4
|
|
5
5
|
def initialize(core_config)
|
6
|
-
|
7
|
-
|
6
|
+
super
|
8
7
|
# inherit from global scope
|
9
8
|
# full configuration path is: defaults => global table => local table
|
10
9
|
@per_page = self.class.per_page
|
10
|
+
@page_links_window = self.class.page_links_window
|
11
11
|
|
12
12
|
# originates here
|
13
13
|
@sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
|
14
|
-
@sorting.
|
14
|
+
@sorting.set_default_sorting(@core.model)
|
15
15
|
|
16
16
|
# inherit from global scope
|
17
17
|
@empty_field_text = self.class.empty_field_text
|
18
|
+
@association_join_text = self.class.association_join_text
|
19
|
+
@pagination = self.class.pagination
|
20
|
+
@show_search_reset = true
|
21
|
+
@mark_records = self.class.mark_records
|
18
22
|
end
|
19
23
|
|
20
24
|
# global level configuration
|
@@ -23,10 +27,28 @@ module ActiveScaffold::Config
|
|
23
27
|
cattr_accessor :per_page
|
24
28
|
@@per_page = 15
|
25
29
|
|
30
|
+
# how many page links around current page to show
|
31
|
+
cattr_accessor :page_links_window
|
32
|
+
@@page_links_window = 2
|
33
|
+
|
26
34
|
# what string to use when a field is empty
|
27
35
|
cattr_accessor :empty_field_text
|
28
36
|
@@empty_field_text = '-'
|
29
37
|
|
38
|
+
# what string to use to join records from plural associations
|
39
|
+
cattr_accessor :association_join_text
|
40
|
+
@@association_join_text = ', '
|
41
|
+
|
42
|
+
# What kind of pagination to use:
|
43
|
+
# * true: The usual pagination
|
44
|
+
# * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
|
45
|
+
# * false: Disable pagination
|
46
|
+
cattr_accessor :pagination
|
47
|
+
@@pagination = true
|
48
|
+
|
49
|
+
# Add a checkbox in front of each record to mark them and use them with a batch action later
|
50
|
+
cattr_accessor :mark_records
|
51
|
+
|
30
52
|
# instance-level configuration
|
31
53
|
# ----------------------------
|
32
54
|
|
@@ -35,17 +57,33 @@ module ActiveScaffold::Config
|
|
35
57
|
self.columns = @core.columns._inheritable unless @columns # lazy evaluation
|
36
58
|
@columns
|
37
59
|
end
|
38
|
-
|
39
|
-
|
40
|
-
@columns.action = self
|
41
|
-
end
|
60
|
+
|
61
|
+
public :columns=
|
42
62
|
|
43
63
|
# how many rows to show at once
|
44
64
|
attr_accessor :per_page
|
45
65
|
|
66
|
+
# how many page links around current page to show
|
67
|
+
attr_accessor :page_links_window
|
68
|
+
|
69
|
+
# What kind of pagination to use:
|
70
|
+
# * true: The usual pagination
|
71
|
+
# * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
|
72
|
+
# * false: Disable pagination
|
73
|
+
attr_accessor :pagination
|
74
|
+
|
46
75
|
# what string to use when a field is empty
|
47
76
|
attr_accessor :empty_field_text
|
48
77
|
|
78
|
+
# what string to use to join records from plural associations
|
79
|
+
attr_accessor :association_join_text
|
80
|
+
|
81
|
+
# show a link to reset the search next to filtered message
|
82
|
+
attr_accessor :show_search_reset
|
83
|
+
|
84
|
+
# Add a checkbox in front of each record to mark them and use them with a batch action later
|
85
|
+
attr_accessor :mark_records
|
86
|
+
|
49
87
|
# the default sorting. should be an array of hashes of {column_name => direction}, e.g. [{:a => 'desc'}, {:b => 'asc'}]. to just sort on one column, you can simply provide a hash, though, e.g. {:a => 'desc'}.
|
50
88
|
def sorting=(val)
|
51
89
|
val = [val] if val.is_a? Hash
|
@@ -62,7 +100,7 @@ module ActiveScaffold::Config
|
|
62
100
|
# the label for this List action. used for the header.
|
63
101
|
attr_writer :label
|
64
102
|
def label
|
65
|
-
@label ? as_(@label) : @core.label
|
103
|
+
@label ? as_(@label, :count => 2) : @core.label(:count => 2)
|
66
104
|
end
|
67
105
|
|
68
106
|
attr_writer :no_entries_message
|
@@ -82,7 +120,6 @@ module ActiveScaffold::Config
|
|
82
120
|
|
83
121
|
def search_partial
|
84
122
|
return "search" if @core.actions.include?(:search)
|
85
|
-
return "live_search" if @core.actions.include?(:live_search)
|
86
123
|
return "field_search" if @core.actions.include?(:field_search)
|
87
124
|
end
|
88
125
|
|
@@ -3,7 +3,8 @@ module ActiveScaffold::Config
|
|
3
3
|
self.crud_type = :read
|
4
4
|
|
5
5
|
def initialize(core_config)
|
6
|
-
|
6
|
+
super
|
7
|
+
@label = :add_existing_model
|
7
8
|
self.shallow_delete = self.class.shallow_delete
|
8
9
|
end
|
9
10
|
|
@@ -17,15 +18,24 @@ module ActiveScaffold::Config
|
|
17
18
|
attr_accessor :shallow_delete
|
18
19
|
|
19
20
|
# Add a nested ActionLink
|
20
|
-
def add_link(label,
|
21
|
-
|
21
|
+
def add_link(label, association, options = {})
|
22
|
+
if association.is_a? Array
|
23
|
+
msg = "config.nested.add_link with multiple associations is not already supported. "
|
24
|
+
if association.size == 1
|
25
|
+
::ActiveSupport::Deprecation.warn(msg + "Remove array", caller)
|
26
|
+
else
|
27
|
+
::ActiveSupport::Deprecation.warn(msg + "The first model will be used", caller)
|
28
|
+
end
|
29
|
+
association = association.first
|
30
|
+
end
|
31
|
+
options.reverse_merge! :security_method => :nested_authorized?, :position => :after
|
32
|
+
options.merge! :label => label, :type => :member, :parameters => {:associations => association}
|
33
|
+
options[:html_options] ||= {}
|
34
|
+
options[:html_options][:class] = [options[:html_options][:class], association].compact.join(' ')
|
35
|
+
@core.action_links.add('nested', options)
|
22
36
|
end
|
23
37
|
|
24
38
|
# the label for this Nested action. used for the header.
|
25
39
|
attr_writer :label
|
26
|
-
def label
|
27
|
-
@label ? as_(@label) : as_(:add_existing_model, :model => @core.label)
|
28
|
-
end
|
29
|
-
|
30
40
|
end
|
31
41
|
end
|