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
@@ -2,8 +2,12 @@ module ActiveScaffold
|
|
2
2
|
module Helpers
|
3
3
|
# A bunch of helper methods to produce the common view ids
|
4
4
|
module IdHelpers
|
5
|
+
def id_from_controller(controller)
|
6
|
+
controller.to_s.gsub("/", "__").html_safe
|
7
|
+
end
|
8
|
+
|
5
9
|
def controller_id
|
6
|
-
@controller_id ||= (params[:eid] || params[:parent_controller] || params[:controller])
|
10
|
+
@controller_id ||= 'as_' + id_from_controller(params[:eid] || params[:parent_controller] || params[:controller])
|
7
11
|
end
|
8
12
|
|
9
13
|
def active_scaffold_id
|
@@ -22,8 +26,8 @@ module ActiveScaffold
|
|
22
26
|
"#{controller_id}-messages"
|
23
27
|
end
|
24
28
|
|
25
|
-
def active_scaffold_calculations_id
|
26
|
-
"#{controller_id}-calculations"
|
29
|
+
def active_scaffold_calculations_id(column = nil)
|
30
|
+
"#{controller_id}-calculations#{'-' + column.name.to_s if column}"
|
27
31
|
end
|
28
32
|
|
29
33
|
def empty_message_id
|
@@ -42,10 +46,6 @@ module ActiveScaffold
|
|
42
46
|
"#{controller_id}-search-input"
|
43
47
|
end
|
44
48
|
|
45
|
-
def table_action_id(name)
|
46
|
-
"#{controller_id}-action-table-#{name}"
|
47
|
-
end
|
48
|
-
|
49
49
|
def action_link_id(link_action,link_id)
|
50
50
|
"#{controller_id}-#{link_action}-#{link_id}-link"
|
51
51
|
end
|
@@ -4,85 +4,97 @@ module ActiveScaffold
|
|
4
4
|
# Helpers that assist with the rendering of a List Column
|
5
5
|
module ListColumnHelpers
|
6
6
|
def get_column_value(record, column)
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
elsif column.inplace_edit and record.authorized_for?(:action => :update, :column => column.name)
|
18
|
-
active_scaffold_inplace_edit(record, column)
|
19
|
-
elsif column.column and override_column_ui?(column.column.type)
|
20
|
-
send(override_column_ui(column.column.type), column, record)
|
21
|
-
else
|
22
|
-
value = record.send(column.name)
|
7
|
+
begin
|
8
|
+
# check for an override helper
|
9
|
+
value = if column_override? column
|
10
|
+
# we only pass the record as the argument. we previously also passed the formatted_value,
|
11
|
+
# but mike perham pointed out that prohibited the usage of overrides to improve on the
|
12
|
+
# performance of our default formatting. see issue #138.
|
13
|
+
send(column_override(column), record)
|
14
|
+
# second, check if the dev has specified a valid list_ui for this column
|
15
|
+
elsif column.list_ui and override_column_ui?(column.list_ui)
|
16
|
+
send(override_column_ui(column.list_ui), column, record)
|
23
17
|
|
24
|
-
|
25
|
-
|
18
|
+
elsif inplace_edit?(record, column)
|
19
|
+
active_scaffold_inplace_edit(record, column)
|
20
|
+
elsif column.column and override_column_ui?(column.column.type)
|
21
|
+
send(override_column_ui(column.column.type), column, record)
|
26
22
|
else
|
27
|
-
|
28
|
-
when :has_one, :belongs_to
|
29
|
-
formatted_value = clean_column_value(format_value(value.to_label))
|
30
|
-
|
31
|
-
when :has_many, :has_and_belongs_to_many
|
32
|
-
if column.associated_limit.nil?
|
33
|
-
firsts = value.collect { |v| v.to_label }
|
34
|
-
else
|
35
|
-
firsts = value.first(column.associated_limit + 1).collect { |v| v.to_label }
|
36
|
-
firsts[column.associated_limit] = '…' if firsts.length > column.associated_limit
|
37
|
-
end
|
38
|
-
formatted_value = clean_column_value(format_value(firsts.join(', ')))
|
39
|
-
formatted_value << " (#{value.length})" if column.associated_number? and column.associated_limit and firsts.length > column.associated_limit
|
40
|
-
formatted_value
|
41
|
-
end
|
23
|
+
format_column_value(record, column)
|
42
24
|
end
|
43
25
|
|
44
|
-
|
26
|
+
value = ' '.html_safe if value.nil? or (value.respond_to?(:empty?) and value.empty?) # fix for IE 6
|
27
|
+
return value
|
28
|
+
rescue Exception => e
|
29
|
+
logger.error Time.now.to_s + "#{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{@controller.class}"
|
30
|
+
raise e
|
45
31
|
end
|
46
|
-
|
47
|
-
value = ' ' if value.nil? or (value.respond_to?(:empty?) and value.empty?) # fix for IE 6
|
48
|
-
return value
|
49
32
|
end
|
50
|
-
|
33
|
+
|
51
34
|
# TODO: move empty_field_text and logic in here?
|
52
35
|
# TODO: move active_scaffold_inplace_edit in here?
|
53
36
|
# TODO: we need to distinguish between the automatic links *we* create and the ones that the dev specified. some logic may not apply if the dev specified the link.
|
54
37
|
def render_list_column(text, column, record)
|
55
38
|
if column.link
|
56
|
-
link = column.link
|
57
|
-
|
58
|
-
column_model = column.association.klass
|
59
|
-
controller_actions = active_scaffold_config_for(column_model).actions
|
60
|
-
if controller_actions.include?(:create) and column.actions_for_association_links.include? :new and column_model.authorized_for?(:action => :create)
|
61
|
-
link.action = 'new'
|
62
|
-
link.crud_type = :create
|
63
|
-
text = as_(:create_new)
|
64
|
-
end
|
65
|
-
end
|
66
|
-
return "<a class='disabled'>#{text}</a>" unless record.authorized_for?(:action => column.link.crud_type)
|
67
|
-
|
39
|
+
link = column.link
|
40
|
+
associated = record.send(column.association.name) if column.association
|
68
41
|
url_options = params_for(:action => nil, :id => record.id, :link => text)
|
69
|
-
if
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
42
|
+
url_options[:parent_controller] = params[:controller] if link.controller and link.controller.to_s != params[:controller]
|
43
|
+
url_options[:id] = associated.id if associated and link.controller and link.controller.to_s != params[:controller]
|
44
|
+
|
45
|
+
# setup automatic link
|
46
|
+
if column.autolink? # link to nested scaffold or inline form
|
47
|
+
link = action_link_to_inline_form(column, associated) if link.crud_type.nil? # automatic link to inline form (singular association)
|
48
|
+
return text if link.crud_type.nil?
|
49
|
+
if link.crud_type == :create
|
50
|
+
url_options[:link] = as_(link.label, :model => column.association.klass.human_name, :parent => column.association.active_record.human_name)
|
74
51
|
url_options[:parent_id] = record.id
|
75
52
|
url_options[:parent_column] = column.association.reverse
|
76
53
|
url_options[:parent_model] = record.class.name # needed for polymorphic associations
|
54
|
+
url_options.delete :id
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
# check authorization
|
59
|
+
if column.association
|
60
|
+
associated_for_authorized = if associated.nil? || (associated.respond_to?(:blank?) && associated.blank?)
|
61
|
+
column.association.klass
|
62
|
+
elsif column.plural_association?
|
63
|
+
associated.first
|
64
|
+
else
|
65
|
+
associated
|
77
66
|
end
|
67
|
+
authorized = associated_for_authorized.authorized_for?(:crud_type => link.crud_type)
|
68
|
+
authorized = authorized and record.authorized_for?(:crud_type => :update, :column => column.name) if link.crud_type == :create
|
69
|
+
else
|
70
|
+
authorized = record.authorized_for?(:crud_type => link.crud_type)
|
78
71
|
end
|
72
|
+
return "<a class='disabled'>#{text}</a>" unless authorized
|
79
73
|
|
80
|
-
render_action_link(link, url_options)
|
74
|
+
render_action_link(link, url_options, record)
|
81
75
|
else
|
82
76
|
text
|
83
77
|
end
|
84
78
|
end
|
85
79
|
|
80
|
+
# setup the action link to inline form
|
81
|
+
def action_link_to_inline_form(column, associated)
|
82
|
+
link = column.link.clone
|
83
|
+
if column_empty?(associated) # if association is empty, we only can link to create form
|
84
|
+
if column.actions_for_association_links.include?(:new)
|
85
|
+
link.action = 'new'
|
86
|
+
link.crud_type = :create
|
87
|
+
end
|
88
|
+
elsif column.actions_for_association_links.include?(:edit)
|
89
|
+
link.action = 'edit'
|
90
|
+
link.crud_type = :update
|
91
|
+
elsif column.actions_for_association_links.include?(:show)
|
92
|
+
link.action = 'show'
|
93
|
+
link.crud_type = :read
|
94
|
+
end
|
95
|
+
link
|
96
|
+
end
|
97
|
+
|
86
98
|
# There are two basic ways to clean a column's value: h() and sanitize(). The latter is useful
|
87
99
|
# when the column contains *valid* html data, and you want to just disable any scripting. People
|
88
100
|
# can always use field overrides to clean data one way or the other, but having this override
|
@@ -98,29 +110,33 @@ module ActiveScaffold
|
|
98
110
|
## Overrides
|
99
111
|
##
|
100
112
|
def active_scaffold_column_text(column, record)
|
101
|
-
truncate(clean_column_value(record.send(column.name)), :length => 50)
|
113
|
+
truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
|
102
114
|
end
|
103
115
|
|
104
116
|
def active_scaffold_column_checkbox(column, record)
|
105
|
-
|
106
|
-
checked = column_value.class.to_s.include?('Class') ? column_value : column_value == 1
|
107
|
-
if column.inplace_edit and record.authorized_for?(:action => :update, :column => column.name)
|
117
|
+
if inplace_edit?(record, column)
|
108
118
|
id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s}
|
109
|
-
tag_options = {:
|
110
|
-
|
111
|
-
content_tag(:span, check_box_tag(tag_options[:id], 1, checked, {:onchange => script}) , tag_options)
|
119
|
+
tag_options = {:id => element_cell_id(id_options), :class => "in_place_editor_field"}
|
120
|
+
content_tag(:span, format_column_checkbox(record, column), tag_options)
|
112
121
|
else
|
113
|
-
|
122
|
+
check_box(:record, column.name, :disabled => true, :id => nil, :object => record)
|
114
123
|
end
|
115
124
|
end
|
116
125
|
|
117
|
-
def
|
118
|
-
"#{column.name
|
126
|
+
def column_override_name(column, old = false)
|
127
|
+
"#{clean_class_name(column.active_record_class.name) + '_' unless old}#{clean_column_name(column.name)}_column"
|
119
128
|
end
|
120
129
|
|
121
|
-
def column_override
|
122
|
-
|
130
|
+
def column_override(column)
|
131
|
+
method = column_override_name(column)
|
132
|
+
return method if respond_to?(method)
|
133
|
+
old_method = column_override_name(column, true)
|
134
|
+
if respond_to?(old_method)
|
135
|
+
ActiveSupport::Deprecation.warn("You are using an old naming schema for overrides, you should name the helper #{method} instead of #{old_method}")
|
136
|
+
old_method
|
137
|
+
end
|
123
138
|
end
|
139
|
+
alias_method :column_override?, :column_override
|
124
140
|
|
125
141
|
def override_column_ui?(list_ui)
|
126
142
|
respond_to?(override_column_ui(list_ui))
|
@@ -135,42 +151,219 @@ module ActiveScaffold
|
|
135
151
|
## Formatting
|
136
152
|
##
|
137
153
|
|
154
|
+
def format_column_checkbox(record, column)
|
155
|
+
checked = ActionView::Helpers::InstanceTag.check_box_checked?(record.send(column.name), '1')
|
156
|
+
script = remote_function(:method => 'POST', :url => {:controller => params_for[:controller], :action => "update_column", :column => column.name, :id => record.id.to_s, :value => checked ? false : 1, :eid => params[:eid]})
|
157
|
+
check_box(:record, column.name, :onclick => script, :id => nil, :object => record)
|
158
|
+
end
|
159
|
+
|
160
|
+
def format_column_value(record, column, value = nil)
|
161
|
+
value ||= record.send(column.name) unless record.nil?
|
162
|
+
if value && column.association # cache association size before calling column_empty?
|
163
|
+
associated_size = value.size if column.plural_association? and column.associated_number? # get count before cache association
|
164
|
+
cache_association(value, column)
|
165
|
+
end
|
166
|
+
if column.association.nil? or column_empty?(value)
|
167
|
+
if column.form_ui == :select && column.options[:options]
|
168
|
+
text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
|
169
|
+
value = active_scaffold_translated_option(column, text, val).first if text
|
170
|
+
end
|
171
|
+
if value.is_a? Numeric
|
172
|
+
format_number_value(value, column.options)
|
173
|
+
else
|
174
|
+
format_value(value, column.options)
|
175
|
+
end
|
176
|
+
else
|
177
|
+
format_association_value(value, column, associated_size)
|
178
|
+
end
|
179
|
+
end
|
180
|
+
|
181
|
+
def format_number_value(value, options = {})
|
182
|
+
value = case options[:format]
|
183
|
+
when :size
|
184
|
+
number_to_human_size(value, options[:i18n_options] || {})
|
185
|
+
when :percentage
|
186
|
+
number_to_percentage(value, options[:i18n_options] || {})
|
187
|
+
when :currency
|
188
|
+
number_to_currency(value, options[:i18n_options] || {})
|
189
|
+
when :i18n_number
|
190
|
+
number_with_delimiter(value, options[:i18n_options] || {})
|
191
|
+
else
|
192
|
+
value
|
193
|
+
end
|
194
|
+
clean_column_value(value)
|
195
|
+
end
|
196
|
+
|
197
|
+
def format_association_value(value, column, size)
|
198
|
+
case column.association.macro
|
199
|
+
when :has_one, :belongs_to
|
200
|
+
format_value(value.to_label)
|
201
|
+
when :has_many, :has_and_belongs_to_many
|
202
|
+
if column.associated_limit.nil?
|
203
|
+
firsts = value.collect { |v| clean_column_value(v.to_label) }
|
204
|
+
else
|
205
|
+
firsts = value.first(column.associated_limit)
|
206
|
+
firsts.collect! { |v| clean_column_value(v.to_label) }
|
207
|
+
firsts[column.associated_limit] = '…' if value.size > column.associated_limit
|
208
|
+
end
|
209
|
+
if column.associated_limit == 0
|
210
|
+
size if column.associated_number?
|
211
|
+
else
|
212
|
+
joined_associated = firsts.join(active_scaffold_config.list.association_join_text)
|
213
|
+
joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
|
214
|
+
joined_associated
|
215
|
+
end
|
216
|
+
end
|
217
|
+
end
|
218
|
+
|
138
219
|
def format_value(column_value, options = {})
|
139
|
-
if column_empty?(column_value)
|
220
|
+
value = if column_empty?(column_value)
|
140
221
|
active_scaffold_config.list.empty_field_text
|
141
222
|
elsif column_value.is_a?(Time) || column_value.is_a?(Date)
|
142
223
|
l(column_value, :format => options[:format] || :default)
|
224
|
+
elsif [FalseClass, TrueClass].include?(column_value.class)
|
225
|
+
as_(column_value.to_s.to_sym)
|
143
226
|
else
|
144
227
|
column_value.to_s
|
145
228
|
end
|
229
|
+
clean_column_value(value)
|
230
|
+
end
|
231
|
+
|
232
|
+
def cache_association(value, column)
|
233
|
+
# we are not using eager loading, cache firsts records in order not to query the database in a future
|
234
|
+
unless value.loaded?
|
235
|
+
# load at least one record, is needed for column_empty? and checking permissions
|
236
|
+
if column.associated_limit.nil?
|
237
|
+
Rails.logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
|
238
|
+
else
|
239
|
+
value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_columns)
|
240
|
+
end
|
241
|
+
end
|
146
242
|
end
|
147
243
|
|
148
244
|
# ==========
|
149
245
|
# = Inline Edit =
|
150
246
|
# ==========
|
247
|
+
|
248
|
+
def inplace_edit?(record, column)
|
249
|
+
column.inplace_edit and record.authorized_for?(:crud_type => :update, :column => column.name)
|
250
|
+
end
|
251
|
+
|
252
|
+
def inplace_edit_cloning?(column)
|
253
|
+
column.inplace_edit != :ajax and (override_form_field?(column) or column.form_ui or (column.column and override_input?(column.column.type)))
|
254
|
+
end
|
255
|
+
|
151
256
|
def format_inplace_edit_column(record,column)
|
152
|
-
value = record.send(column.name)
|
153
257
|
if column.list_ui == :checkbox
|
154
|
-
|
258
|
+
format_column_checkbox(record, column)
|
155
259
|
else
|
156
|
-
|
260
|
+
format_column_value(record, column)
|
157
261
|
end
|
158
262
|
end
|
159
263
|
|
160
|
-
def active_scaffold_inplace_edit(record, column)
|
161
|
-
formatted_column =
|
264
|
+
def active_scaffold_inplace_edit(record, column, options = {})
|
265
|
+
formatted_column = options[:formatted_column] || format_column_value(record, column)
|
162
266
|
id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s}
|
163
|
-
tag_options = {:
|
164
|
-
in_place_editor_options = {
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
267
|
+
tag_options = {:id => element_cell_id(id_options), :class => "in_place_editor_field"}
|
268
|
+
in_place_editor_options = {
|
269
|
+
:url => {:controller => params_for[:controller], :action => "update_column", :column => column.name, :id => record.id.to_s},
|
270
|
+
:with => params[:eid] ? "Form.serialize(form) + '&eid=#{params[:eid]}'" : nil,
|
271
|
+
:click_to_edit_text => as_(:click_to_edit),
|
272
|
+
:cancel_text => as_(:cancel),
|
273
|
+
:loading_text => as_(:loading),
|
274
|
+
:save_text => as_(:update),
|
275
|
+
:saving_text => as_(:saving),
|
276
|
+
:ajax_options => "{method: 'post'}",
|
277
|
+
:script => true
|
278
|
+
}
|
279
|
+
|
280
|
+
if inplace_edit_cloning?(column)
|
281
|
+
in_place_editor_options.merge!(
|
282
|
+
:inplace_pattern_selector => "##{active_scaffold_column_header_id(column)} .#{inplace_edit_control_css_class}",
|
283
|
+
:node_id_suffix => record.id.to_s,
|
284
|
+
:form_customization => 'element.clonePatternField();'
|
285
|
+
)
|
286
|
+
elsif column.inplace_edit == :ajax
|
287
|
+
url = url_for(:controller => params_for[:controller], :action => 'render_field', :id => record.id, :column => column.name, :update_column => column.name, :in_place_editing => true, :escape => false)
|
288
|
+
plural = column.plural_association? && !override_form_field?(column) && [:select, :record_select].include?(column.form_ui)
|
289
|
+
in_place_editor_options[:form_customization] = "element.setFieldFromAjax('#{escape_javascript(url)}', {plural: #{!!plural}});"
|
290
|
+
elsif column.column.try(:type) == :text
|
291
|
+
in_place_editor_options[:rows] = column.options[:rows] || 5
|
292
|
+
end
|
293
|
+
|
294
|
+
in_place_editor_options.merge!(column.options)
|
295
|
+
content_tag(:span, formatted_column, tag_options) + active_scaffold_in_place_editor(tag_options[:id], in_place_editor_options)
|
296
|
+
end
|
297
|
+
|
298
|
+
def inplace_edit_control(column)
|
299
|
+
if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
|
300
|
+
@record = active_scaffold_config.model.new
|
301
|
+
column = column.clone
|
302
|
+
column.update_column = nil
|
303
|
+
column.form_ui = :select if (column.association && column.form_ui.nil?)
|
304
|
+
content_tag(:div, active_scaffold_input_for(column), {:style => "display:none;", :class => inplace_edit_control_css_class})
|
305
|
+
end
|
306
|
+
end
|
307
|
+
|
308
|
+
def inplace_edit_control_css_class
|
309
|
+
"as_inplace_pattern"
|
310
|
+
end
|
311
|
+
|
312
|
+
def active_scaffold_in_place_editor(field_id, options = {})
|
313
|
+
function = "new ActiveScaffold.InPlaceEditor("
|
314
|
+
function << "'#{field_id}', "
|
315
|
+
function << "'#{url_for(options[:url])}'"
|
316
|
+
|
317
|
+
js_options = {}
|
318
|
+
|
319
|
+
if protect_against_forgery?
|
320
|
+
options[:with] ||= "Form.serialize(form)"
|
321
|
+
options[:with] += " + '&authenticity_token=' + encodeURIComponent('#{form_authenticity_token}')"
|
322
|
+
end
|
323
|
+
|
324
|
+
js_options['cancelText'] = %('#{options[:cancel_text]}') if options[:cancel_text]
|
325
|
+
js_options['okText'] = %('#{options[:save_text]}') if options[:save_text]
|
326
|
+
js_options['okControl'] = %('#{options[:save_control_type]}') if options[:save_control_type]
|
327
|
+
js_options['cancelControl'] = %('#{options[:cancel_control_type]}') if options[:cancel_control_type]
|
328
|
+
js_options['loadingText'] = %('#{options[:loading_text]}') if options[:loading_text]
|
329
|
+
js_options['savingText'] = %('#{options[:saving_text]}') if options[:saving_text]
|
330
|
+
js_options['rows'] = options[:rows] if options[:rows]
|
331
|
+
js_options['cols'] = options[:cols] if options[:cols]
|
332
|
+
js_options['size'] = options[:size] if options[:size]
|
333
|
+
js_options['externalControl'] = "'#{options[:external_control]}'" if options[:external_control]
|
334
|
+
js_options['externalControlOnly'] = "true" if options[:external_control_only]
|
335
|
+
js_options['submitOnBlur'] = "'#{options[:submit_on_blur]}'" if options[:submit_on_blur]
|
336
|
+
js_options['loadTextURL'] = "'#{url_for(options[:load_text_url])}'" if options[:load_text_url]
|
337
|
+
js_options['ajaxOptions'] = options[:ajax_options] if options[:ajax_options]
|
338
|
+
js_options['htmlResponse'] = !options[:script] if options[:script]
|
339
|
+
js_options['callback'] = "function(form) { return #{options[:with]} }" if options[:with]
|
340
|
+
js_options['clickToEditText'] = %('#{options[:click_to_edit_text]}') if options[:click_to_edit_text]
|
341
|
+
js_options['textBetweenControls'] = %('#{options[:text_between_controls]}') if options[:text_between_controls]
|
342
|
+
js_options['highlightcolor'] = %('#{options[:highlight_color]}') if options[:highlight_color]
|
343
|
+
js_options['highlightendcolor'] = %('#{options[:highlight_end_color]}') if options[:highlight_end_color]
|
344
|
+
js_options['onFailure'] = "function(element, transport) { #{options[:failure]} }" if options[:failure]
|
345
|
+
js_options['onComplete'] = "function(transport, element) { #{options[:complete]} }" if options[:complete]
|
346
|
+
js_options['onEnterEditMode'] = "function(element) { #{options[:enter_editing]} }" if options[:enter_editing]
|
347
|
+
js_options['onLeaveEditMode'] = "function(element) { #{options[:exit_editing]} }" if options[:exit_editing]
|
348
|
+
js_options['onFormCustomization'] = "function(element, form) { #{options[:form_customization]} }" if options[:form_customization]
|
349
|
+
js_options['inplacePatternSelector'] = %('#{options[:inplace_pattern_selector]}') if options[:inplace_pattern_selector]
|
350
|
+
js_options['nodeIdSuffix'] = %('#{options[:node_id_suffix]}') if options[:node_id_suffix]
|
351
|
+
function << (', ' + options_for_javascript(js_options)) unless js_options.empty?
|
352
|
+
|
353
|
+
function << ')'
|
354
|
+
|
355
|
+
javascript_tag(function)
|
356
|
+
end
|
357
|
+
|
358
|
+
def mark_record(checked, url_params = {})
|
359
|
+
url_params.reverse_merge!(:controller => params_for[:controller], :action => 'mark', :eid => params[:eid])
|
360
|
+
ajax_options = {:method => :put,
|
361
|
+
:url => url_for(url_params),
|
362
|
+
:with => "'value=' + this.checked",
|
363
|
+
:after => "var checkbox = this; this.disable();",
|
364
|
+
:complete => "checkbox.enable();"}
|
365
|
+
script = remote_function(ajax_options)
|
366
|
+
check_box_tag('mark', '1', checked, :onclick => script, :class => 'mark_record')
|
174
367
|
end
|
175
368
|
|
176
369
|
end
|