fat_free_crm 0.16.4 → 0.17.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of fat_free_crm might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.rubocop.yml +44 -5
- data/.rubocop_todo.yml +23 -359
- data/.travis.yml +21 -21
- data/CHANGELOG.md +42 -9
- data/Capfile +2 -0
- data/Gemfile +4 -1
- data/Gemfile.lock +27 -25
- data/Guardfile +2 -0
- data/README.md +5 -5
- data/Rakefile +2 -0
- data/Vagrantfile +92 -0
- data/app/assets/javascripts/application.js.erb +0 -2
- data/app/assets/javascripts/crm.js.coffee +16 -20
- data/app/assets/stylesheets/application.css.erb +0 -2
- data/app/controllers/admin/application_controller.rb +3 -1
- data/app/controllers/admin/field_groups_controller.rb +2 -0
- data/app/controllers/admin/fields_controller.rb +4 -5
- data/app/controllers/admin/groups_controller.rb +2 -0
- data/app/controllers/admin/plugins_controller.rb +3 -7
- data/app/controllers/admin/settings_controller.rb +3 -5
- data/app/controllers/admin/tags_controller.rb +3 -5
- data/app/controllers/admin/users_controller.rb +4 -2
- data/app/controllers/application_controller.rb +16 -16
- data/app/controllers/authentications_controller.rb +4 -2
- data/app/controllers/comments_controller.rb +5 -4
- data/app/controllers/emails_controller.rb +2 -0
- data/app/controllers/entities/accounts_controller.rb +14 -7
- data/app/controllers/entities/campaigns_controller.rb +15 -8
- data/app/controllers/entities/contacts_controller.rb +28 -21
- data/app/controllers/entities/leads_controller.rb +33 -22
- data/app/controllers/entities/opportunities_controller.rb +33 -26
- data/app/controllers/entities_controller.rb +15 -1
- data/app/controllers/home_controller.rb +10 -5
- data/app/controllers/lists_controller.rb +3 -5
- data/app/controllers/passwords_controller.rb +3 -1
- data/app/controllers/tasks_controller.rb +11 -9
- data/app/controllers/users_controller.rb +4 -1
- data/app/helpers/accounts_helper.rb +14 -19
- data/app/helpers/addresses_helper.rb +2 -0
- data/app/helpers/admin/application_helper.rb +3 -2
- data/app/helpers/admin/field_groups_helper.rb +2 -0
- data/app/helpers/admin/fields_helper.rb +2 -0
- data/app/helpers/admin/plugins_helper.rb +2 -0
- data/app/helpers/admin/settings_helper.rb +2 -0
- data/app/helpers/admin/tags_helper.rb +2 -0
- data/app/helpers/admin/users_helper.rb +37 -17
- data/app/helpers/application_helper.rb +62 -68
- data/app/helpers/authentications_helper.rb +2 -0
- data/app/helpers/campaigns_helper.rb +3 -1
- data/app/helpers/comments_helper.rb +2 -0
- data/app/helpers/contacts_helper.rb +5 -3
- data/app/helpers/emails_helper.rb +2 -0
- data/app/helpers/fields_helper.rb +2 -0
- data/app/helpers/groups_helper.rb +2 -0
- data/app/helpers/home_helper.rb +2 -0
- data/app/helpers/javascript_helper.rb +2 -0
- data/app/helpers/leads_helper.rb +4 -3
- data/app/helpers/lists_helper.rb +2 -0
- data/app/helpers/opportunities_helper.rb +11 -11
- data/app/helpers/passwords_helper.rb +2 -0
- data/app/helpers/remote_link_pagination_helper.rb +2 -0
- data/app/helpers/tags_helper.rb +4 -2
- data/app/helpers/tasks_helper.rb +11 -10
- data/app/helpers/users_helper.rb +3 -1
- data/app/helpers/versions_helper.rb +2 -0
- data/app/inputs/date_pair_input.rb +2 -0
- data/app/inputs/date_time_input.rb +2 -0
- data/app/inputs/datetime_pair_input.rb +2 -0
- data/app/inputs/text_input.rb +2 -0
- data/app/mailers/dropbox_mailer.rb +2 -0
- data/app/mailers/subscription_mailer.rb +14 -8
- data/app/mailers/user_mailer.rb +3 -2
- data/app/models/entities/account.rb +17 -9
- data/app/models/entities/account_contact.rb +3 -1
- data/app/models/entities/account_opportunity.rb +3 -1
- data/app/models/entities/campaign.rb +3 -1
- data/app/models/entities/contact.rb +9 -7
- data/app/models/entities/contact_opportunity.rb +2 -0
- data/app/models/entities/lead.rb +3 -1
- data/app/models/entities/opportunity.rb +3 -1
- data/app/models/fields/core_field.rb +3 -0
- data/app/models/fields/custom_field.rb +8 -5
- data/app/models/fields/custom_field_date_pair.rb +3 -1
- data/app/models/fields/custom_field_datetime_pair.rb +3 -1
- data/app/models/fields/custom_field_pair.rb +2 -0
- data/app/models/fields/field.rb +9 -4
- data/app/models/fields/field_group.rb +3 -1
- data/app/models/list.rb +2 -0
- data/app/models/observers/entity_observer.rb +2 -0
- data/app/models/observers/lead_observer.rb +3 -1
- data/app/models/observers/opportunity_observer.rb +5 -3
- data/app/models/observers/task_observer.rb +2 -0
- data/app/models/polymorphic/address.rb +2 -0
- data/app/models/polymorphic/avatar.rb +2 -0
- data/app/models/polymorphic/comment.rb +2 -0
- data/app/models/polymorphic/email.rb +2 -0
- data/app/models/polymorphic/tag.rb +2 -0
- data/app/models/polymorphic/tagging.rb +2 -0
- data/app/models/polymorphic/task.rb +9 -8
- data/app/models/polymorphic/version.rb +3 -1
- data/app/models/setting.rb +16 -0
- data/app/models/users/ability.rb +2 -0
- data/app/models/users/authentication.rb +2 -0
- data/app/models/users/group.rb +2 -0
- data/app/models/users/permission.rb +2 -0
- data/app/models/users/preference.rb +2 -0
- data/app/models/users/user.rb +15 -15
- data/app/views/accounts/_account.html.haml +3 -3
- data/app/views/accounts/_contact_info.html.haml +7 -7
- data/app/views/accounts/_edit.html.haml +8 -8
- data/app/views/accounts/_index_brief.html.haml +11 -11
- data/app/views/accounts/_index_long.html.haml +12 -12
- data/app/views/accounts/_new.html.haml +9 -9
- data/app/views/accounts/_sidebar_index.html.haml +5 -5
- data/app/views/accounts/_sidebar_show.html.haml +11 -11
- data/app/views/accounts/_title_bar.html.haml +2 -2
- data/app/views/accounts/_top_section.html.haml +8 -8
- data/app/views/accounts/create.js.haml +3 -3
- data/app/views/accounts/destroy.js.haml +1 -1
- data/app/views/accounts/edit.js.haml +4 -4
- data/app/views/accounts/index.js.haml +4 -4
- data/app/views/accounts/index.xls.builder +3 -1
- data/app/views/accounts/new.js.haml +1 -1
- data/app/views/accounts/show.html.haml +8 -8
- data/app/views/accounts/show.js.haml +1 -1
- data/app/views/accounts/update.js.haml +2 -2
- data/app/views/admin/custom_fields/_base_field.html.haml +4 -2
- data/app/views/admin/custom_fields/_check_boxes_field.html.haml +2 -2
- data/app/views/admin/custom_fields/_date_field.html.haml +1 -1
- data/app/views/admin/custom_fields/_date_pair_field.html.haml +2 -2
- data/app/views/admin/custom_fields/_datetime_field.html.haml +1 -1
- data/app/views/admin/custom_fields/_datetime_pair_field.html.haml +2 -2
- data/app/views/admin/custom_fields/_radio_field.html.haml +2 -2
- data/app/views/admin/custom_fields/_select_field.html.haml +1 -1
- data/app/views/admin/custom_fields/_string_field.html.haml +1 -1
- data/app/views/admin/field_groups/_confirm.html.haml +1 -1
- data/app/views/admin/field_groups/_edit.html.haml +3 -3
- data/app/views/admin/field_groups/_field_group.html.haml +9 -9
- data/app/views/admin/field_groups/_new.html.haml +4 -4
- data/app/views/admin/field_groups/_top_section.html.haml +3 -3
- data/app/views/admin/field_groups/confirm.js.haml +1 -1
- data/app/views/admin/field_groups/create.js.haml +2 -2
- data/app/views/admin/field_groups/edit.js.haml +1 -1
- data/app/views/admin/field_groups/new.js.haml +1 -1
- data/app/views/admin/field_groups/update.js.haml +1 -1
- data/app/views/admin/fields/_field.html.haml +4 -4
- data/app/views/admin/fields/_form.html.haml +10 -10
- data/app/views/admin/fields/_subform.html.haml +2 -2
- data/app/views/admin/fields/create.js.haml +2 -2
- data/app/views/admin/fields/edit.js.haml +1 -1
- data/app/views/admin/fields/index.html.haml +6 -6
- data/app/views/admin/fields/show.html.haml +1 -1
- data/app/views/admin/fields/update.js.haml +2 -2
- data/app/views/admin/groups/_edit.html.haml +3 -3
- data/app/views/admin/groups/_form.html.haml +1 -1
- data/app/views/admin/groups/_group.html.haml +4 -4
- data/app/views/admin/groups/_new.html.haml +3 -3
- data/app/views/admin/groups/create.js.haml +2 -2
- data/app/views/admin/groups/edit.js.haml +2 -2
- data/app/views/admin/groups/index.html.haml +3 -3
- data/app/views/admin/groups/index.js.haml +2 -2
- data/app/views/admin/groups/new.js.haml +1 -1
- data/app/views/admin/groups/update.js.haml +2 -2
- data/app/views/admin/plugins/_plugin.html.haml +1 -1
- data/app/views/admin/tags/_confirm.html.haml +2 -2
- data/app/views/admin/tags/_edit.html.haml +3 -3
- data/app/views/admin/tags/_new.html.haml +3 -3
- data/app/views/admin/tags/_tag.html.haml +4 -4
- data/app/views/admin/tags/confirm.js.haml +1 -1
- data/app/views/admin/tags/create.js.haml +2 -2
- data/app/views/admin/tags/edit.js.haml +3 -3
- data/app/views/admin/tags/index.html.haml +3 -3
- data/app/views/admin/tags/new.js.haml +1 -1
- data/app/views/admin/tags/update.js.haml +2 -2
- data/app/views/admin/users/_confirm.html.haml +1 -1
- data/app/views/admin/users/_edit.html.haml +3 -3
- data/app/views/admin/users/_new.html.haml +3 -3
- data/app/views/admin/users/_profile.html.haml +3 -3
- data/app/views/admin/users/_user.html.haml +16 -16
- data/app/views/admin/users/confirm.js.haml +1 -1
- data/app/views/admin/users/create.js.haml +2 -2
- data/app/views/admin/users/edit.js.haml +3 -3
- data/app/views/admin/users/index.html.haml +3 -3
- data/app/views/admin/users/index.js.haml +2 -2
- data/app/views/admin/users/new.js.haml +1 -1
- data/app/views/admin/users/reactivate.js.haml +1 -1
- data/app/views/admin/users/suspend.js.haml +1 -1
- data/app/views/admin/users/update.js.haml +2 -2
- data/app/views/application/_auto_complete.html.haml +3 -3
- data/app/views/application/index.atom.builder +10 -6
- data/app/views/application/index.rss.builder +3 -1
- data/app/views/application/show.atom.builder +11 -7
- data/app/views/application/show.rss.builder +4 -2
- data/app/views/authentications/new.html.haml +1 -1
- data/app/views/campaigns/_campaign.html.haml +3 -3
- data/app/views/campaigns/_edit.html.haml +7 -7
- data/app/views/campaigns/_index_brief.html.haml +3 -3
- data/app/views/campaigns/_index_long.html.haml +5 -5
- data/app/views/campaigns/_metrics.html.haml +5 -5
- data/app/views/campaigns/_new.html.haml +8 -8
- data/app/views/campaigns/_objectives.html.haml +6 -6
- data/app/views/campaigns/_sidebar_index.html.haml +5 -5
- data/app/views/campaigns/_sidebar_show.html.haml +10 -10
- data/app/views/campaigns/_status.html.haml +1 -1
- data/app/views/campaigns/_title_bar.html.haml +2 -2
- data/app/views/campaigns/_top_section.html.haml +9 -9
- data/app/views/campaigns/create.js.haml +3 -3
- data/app/views/campaigns/destroy.js.haml +1 -1
- data/app/views/campaigns/edit.js.haml +4 -4
- data/app/views/campaigns/index.js.haml +4 -4
- data/app/views/campaigns/index.xls.builder +22 -20
- data/app/views/campaigns/new.js.haml +1 -1
- data/app/views/campaigns/show.html.haml +9 -9
- data/app/views/campaigns/show.js.haml +1 -1
- data/app/views/campaigns/update.js.haml +2 -2
- data/app/views/comments/_comment.html.haml +5 -5
- data/app/views/comments/_edit.html.haml +5 -5
- data/app/views/comments/_new.html.haml +15 -15
- data/app/views/comments/_subscription_links.html.haml +3 -3
- data/app/views/comments/create.js.haml +1 -1
- data/app/views/comments/edit.js.haml +2 -2
- data/app/views/comments/update.js.haml +2 -2
- data/app/views/contacts/_contact.html.haml +3 -3
- data/app/views/contacts/_contacts.html.haml +2 -2
- data/app/views/contacts/_edit.html.haml +9 -9
- data/app/views/contacts/_extra.html.haml +3 -3
- data/app/views/contacts/_index_brief.html.haml +3 -3
- data/app/views/contacts/_index_full.html.haml +11 -11
- data/app/views/contacts/_index_long.html.haml +5 -5
- data/app/views/contacts/_new.html.haml +10 -10
- data/app/views/contacts/_section_extra.html.haml +1 -1
- data/app/views/contacts/_section_general.html.haml +1 -1
- data/app/views/contacts/_sidebar_show.html.haml +8 -8
- data/app/views/contacts/_title_bar.html.haml +2 -2
- data/app/views/contacts/_top_section.html.haml +9 -9
- data/app/views/contacts/create.js.haml +4 -4
- data/app/views/contacts/destroy.js.haml +2 -2
- data/app/views/contacts/edit.js.haml +4 -4
- data/app/views/contacts/index.js.haml +4 -4
- data/app/views/contacts/index.xls.builder +3 -1
- data/app/views/contacts/new.js.haml +1 -1
- data/app/views/contacts/show.html.haml +7 -7
- data/app/views/contacts/show.js.haml +1 -1
- data/app/views/contacts/update.js.haml +3 -3
- data/app/views/emails/_email.html.haml +6 -6
- data/app/views/entities/_basic_search.html.haml +3 -3
- data/app/views/entities/_permissions.html.haml +10 -10
- data/app/views/entities/_search.html.haml +6 -6
- data/app/views/entities/_section_custom_fields.html.haml +3 -3
- data/app/views/entities/_title_bar.html.haml +3 -3
- data/app/views/entities/attach.js.haml +2 -2
- data/app/views/entities/contacts.js.haml +2 -2
- data/app/views/entities/leads.js.haml +2 -2
- data/app/views/entities/opportunities.js.haml +2 -2
- data/app/views/entities/subscription_update.js.haml +1 -1
- data/app/views/entities/versions.js.haml +2 -2
- data/app/views/fields/_edit_custom_field_group.html.haml +2 -2
- data/app/views/fields/_group.html.haml +5 -5
- data/app/views/fields/_group_table.html.haml +2 -2
- data/app/views/fields/_groups.html.haml +1 -1
- data/app/views/fields/_sidebar_show.html.haml +1 -1
- data/app/views/fields/group.js.erb +1 -1
- data/app/views/home/_account.html.haml +11 -11
- data/app/views/home/_activity.html.haml +7 -7
- data/app/views/home/_assets_menu.html.haml +1 -1
- data/app/views/home/_opportunity.html.haml +8 -8
- data/app/views/home/_options.html.haml +2 -2
- data/app/views/home/_task.html.haml +7 -7
- data/app/views/home/index.atom.builder +5 -3
- data/app/views/home/index.html.haml +6 -6
- data/app/views/home/index.js.haml +3 -3
- data/app/views/home/index.rss.builder +2 -0
- data/app/views/home/options.js.haml +1 -1
- data/app/views/layouts/500.html.haml +2 -2
- data/app/views/layouts/_footer.html.haml +1 -1
- data/app/views/layouts/_header.html.haml +3 -3
- data/app/views/layouts/_jumpbox.html.haml +1 -1
- data/app/views/layouts/_tabbed.html.haml +4 -4
- data/app/views/layouts/_tabless.html.haml +1 -1
- data/app/views/layouts/admin/_header.html.haml +3 -3
- data/app/views/layouts/admin/application.html.haml +5 -5
- data/app/views/layouts/application.html.haml +3 -3
- data/app/views/layouts/header.xls.builder +2 -0
- data/app/views/leads/_contact.html.haml +2 -2
- data/app/views/leads/_convert.html.haml +2 -2
- data/app/views/leads/_convert_permissions.html.haml +10 -10
- data/app/views/leads/_edit.html.haml +10 -10
- data/app/views/leads/_index_brief.html.haml +6 -6
- data/app/views/leads/_index_long.html.haml +7 -7
- data/app/views/leads/_lead.html.haml +3 -3
- data/app/views/leads/_leads.html.haml +2 -2
- data/app/views/leads/_new.html.haml +11 -11
- data/app/views/leads/_opportunity.html.haml +6 -6
- data/app/views/leads/_sidebar_index.html.haml +5 -5
- data/app/views/leads/_sidebar_show.html.haml +13 -13
- data/app/views/leads/_status.html.haml +7 -7
- data/app/views/leads/_title_bar.html.haml +3 -3
- data/app/views/leads/_top_section.html.haml +8 -8
- data/app/views/leads/convert.js.haml +4 -4
- data/app/views/leads/create.js.haml +3 -3
- data/app/views/leads/destroy.js.haml +1 -1
- data/app/views/leads/edit.js.haml +4 -4
- data/app/views/leads/index.js.haml +4 -4
- data/app/views/leads/index.xls.builder +3 -1
- data/app/views/leads/new.js.haml +1 -1
- data/app/views/leads/promote.js.haml +4 -4
- data/app/views/leads/reject.js.haml +1 -1
- data/app/views/leads/show.html.haml +6 -6
- data/app/views/leads/show.js.haml +1 -1
- data/app/views/leads/update.js.haml +3 -3
- data/app/views/lists/_lists.html.haml +2 -2
- data/app/views/lists/_sidebar.html.haml +8 -8
- data/app/views/opportunities/_edit.html.haml +7 -7
- data/app/views/opportunities/_index_brief.html.haml +4 -4
- data/app/views/opportunities/_index_long.html.haml +11 -11
- data/app/views/opportunities/_new.html.haml +8 -8
- data/app/views/opportunities/_opportunities.html.haml +2 -2
- data/app/views/opportunities/_opportunity.html.haml +3 -3
- data/app/views/opportunities/_sidebar_index.html.haml +5 -5
- data/app/views/opportunities/_sidebar_show.html.haml +12 -12
- data/app/views/opportunities/_title_bar.html.haml +2 -2
- data/app/views/opportunities/_top_section.html.haml +14 -14
- data/app/views/opportunities/contacts.js.haml +2 -2
- data/app/views/opportunities/create.js.haml +4 -4
- data/app/views/opportunities/destroy.js.haml +2 -2
- data/app/views/opportunities/edit.js.haml +4 -4
- data/app/views/opportunities/index.js.haml +4 -4
- data/app/views/opportunities/index.xls.builder +3 -1
- data/app/views/opportunities/new.js.haml +1 -1
- data/app/views/opportunities/show.html.haml +7 -7
- data/app/views/opportunities/show.js.haml +1 -1
- data/app/views/opportunities/update.js.haml +3 -3
- data/app/views/passwords/edit.html.haml +2 -2
- data/app/views/passwords/new.html.haml +1 -1
- data/app/views/shared/_address.html.haml +3 -3
- data/app/views/shared/_comment.html.haml +1 -1
- data/app/views/shared/_edit_comment.html.haml +5 -5
- data/app/views/shared/_empty.html.haml +1 -1
- data/app/views/shared/_paginate_with_per_page.html.haml +1 -1
- data/app/views/shared/_recent.html.haml +2 -2
- data/app/views/shared/_recently.html.haml +1 -1
- data/app/views/shared/_search.html.haml +2 -2
- data/app/views/shared/_tags.html.haml +2 -2
- data/app/views/shared/_tasks.html.haml +5 -5
- data/app/views/subscription_mailer/comment_notification.text.erb +2 -2
- data/app/views/tasks/_assigned.html.haml +4 -4
- data/app/views/tasks/_completed.html.haml +2 -2
- data/app/views/tasks/_edit.html.haml +4 -4
- data/app/views/tasks/_empty.html.haml +1 -1
- data/app/views/tasks/_new.html.haml +3 -3
- data/app/views/tasks/_pending.html.haml +7 -7
- data/app/views/tasks/_related.html.haml +2 -2
- data/app/views/tasks/_selector.html.haml +4 -4
- data/app/views/tasks/_sidebar_index.html.haml +7 -7
- data/app/views/tasks/_title.html.haml +2 -2
- data/app/views/tasks/_top_section.html.haml +9 -9
- data/app/views/tasks/complete.js.haml +2 -2
- data/app/views/tasks/create.js.haml +6 -6
- data/app/views/tasks/edit.js.haml +3 -3
- data/app/views/tasks/index.html.haml +4 -4
- data/app/views/tasks/index.xls.builder +5 -3
- data/app/views/tasks/new.js.haml +1 -1
- data/app/views/tasks/update.js.haml +1 -1
- data/app/views/users/_avatar.html.haml +5 -5
- data/app/views/users/_password.html.haml +3 -3
- data/app/views/users/_profile.html.haml +10 -10
- data/app/views/users/_user.html.haml +3 -3
- data/app/views/users/_user_report.html.haml +2 -2
- data/app/views/users/avatar.js.haml +1 -1
- data/app/views/users/change_password.js.haml +1 -1
- data/app/views/users/edit.js.haml +1 -1
- data/app/views/users/new.html.haml +2 -2
- data/app/views/users/opportunities_overview.html.haml +2 -2
- data/app/views/users/password.js.haml +1 -1
- data/app/views/users/show.html.haml +4 -4
- data/app/views/users/update.js.haml +4 -2
- data/app/views/users/upload_avatar.js.haml +2 -2
- data/app/views/versions/_version.html.haml +3 -3
- data/app/views/versions/_version_item.html.haml +3 -3
- data/app/views/versions/_versions.html.haml +2 -2
- data/bin/bundle +2 -0
- data/bin/rails +3 -1
- data/bin/rake +2 -0
- data/config.ru +3 -1
- data/config/application.rb +2 -0
- data/config/boot.rb +2 -0
- data/config/brakeman.ignore +139 -0
- data/config/deploy.example.rb +2 -0
- data/config/environment.rb +2 -0
- data/config/environments/development.rb +2 -0
- data/config/environments/production.rb +2 -0
- data/config/environments/staging.rb +2 -0
- data/config/environments/test.rb +2 -0
- data/config/initializers/action_mailer.rb +2 -0
- data/config/initializers/assets.rb +3 -1
- data/config/initializers/authlogic.rb +2 -0
- data/config/initializers/backtrace_silencers.rb +2 -0
- data/config/initializers/constants.rb +2 -0
- data/config/initializers/cookies_serializer.rb +2 -0
- data/config/initializers/custom_field_ransack_translations.rb +2 -0
- data/config/initializers/filter_parameter_logging.rb +2 -0
- data/config/initializers/gravatar.rb +2 -0
- data/config/initializers/inflections.rb +2 -0
- data/config/initializers/locale.rb +2 -0
- data/config/initializers/mime_types.rb +2 -0
- data/config/initializers/paginate_arrays.rb +2 -0
- data/config/initializers/paper_trail.rb +2 -0
- data/config/initializers/ransack.rb +2 -0
- data/config/initializers/relative_url_root.rb +2 -0
- data/config/initializers/secret_token.rb +2 -0
- data/config/initializers/session_store.rb +2 -0
- data/config/initializers/simple_form.rb +2 -0
- data/config/initializers/views.rb +3 -2
- data/config/initializers/wrap_parameters.rb +2 -0
- data/config/locales/fat_free_crm.de.yml +1 -0
- data/config/locales/fat_free_crm.en-GB.yml +7 -5
- data/config/locales/fat_free_crm.en-US.yml +7 -5
- data/config/locales/fat_free_crm.es-CL.yml +2 -1
- data/config/locales/fat_free_crm.es.yml +17 -16
- data/config/locales/fat_free_crm.fr.yml +1 -0
- data/config/locales/fat_free_crm.ja.yml +555 -184
- data/config/locales/fat_free_crm.nl.yml +2 -1
- data/config/locales/fat_free_crm.pt-BR.yml +1 -0
- data/config/locales/fat_free_crm.ru.yml +1 -0
- data/config/puma.rb +2 -0
- data/config/routes.rb +3 -1
- data/custom_plan.rb +2 -0
- data/db/demo/accounts.yml +1 -1
- data/db/demo/emails.yml +1 -1
- data/db/migrate/20100928030598_create_sessions.rb +2 -0
- data/db/migrate/20100928030599_create_users.rb +3 -1
- data/db/migrate/20100928030600_create_openid_tables.rb +3 -1
- data/db/migrate/20100928030601_create_accounts.rb +2 -0
- data/db/migrate/20100928030602_create_permissions.rb +4 -2
- data/db/migrate/20100928030603_create_settings.rb +2 -0
- data/db/migrate/20100928030604_create_preferences.rb +2 -0
- data/db/migrate/20100928030605_create_campaigns.rb +3 -1
- data/db/migrate/20100928030606_create_leads.rb +3 -1
- data/db/migrate/20100928030607_create_contacts.rb +3 -1
- data/db/migrate/20100928030608_create_opportunities.rb +3 -1
- data/db/migrate/20100928030609_create_account_contacts.rb +2 -0
- data/db/migrate/20100928030610_create_account_opportunities.rb +2 -0
- data/db/migrate/20100928030611_create_contact_opportunities.rb +2 -0
- data/db/migrate/20100928030612_create_tasks.rb +2 -0
- data/db/migrate/20100928030613_create_comments.rb +4 -2
- data/db/migrate/20100928030614_create_activities.rb +7 -5
- data/db/migrate/20100928030615_create_avatars.rb +5 -3
- data/db/migrate/20100928030616_rename_remember_token.rb +2 -0
- data/db/migrate/20100928030617_drop_openid_tables.rb +3 -1
- data/db/migrate/20100928030618_add_admin_to_users.rb +3 -1
- data/db/migrate/20100928030619_add_suspended_to_users.rb +2 -0
- data/db/migrate/20100928030620_remove_uuid.rb +2 -0
- data/db/migrate/20100928030621_add_email_to_accounts.rb +2 -0
- data/db/migrate/20100928030622_add_background_info_to_models.rb +2 -0
- data/db/migrate/20100928030623_create_addresses.rb +2 -0
- data/db/migrate/20100928030624_add_index_on_permissions.rb +2 -0
- data/db/migrate/20100928030625_create_emails.rb +11 -9
- data/db/migrate/20100928030626_add_state_to_timeline_objects.rb +2 -0
- data/db/migrate/20100928030627_acts_as_taggable_on_migration.rb +2 -0
- data/db/migrate/20101221123456_add_single_access_token_to_users.rb +2 -0
- data/db/migrate/20101221345678_add_rating_and_category_to_accounts.rb +2 -0
- data/db/migrate/20110719082054_add_skype_to_contacts_and_leads.rb +2 -0
- data/db/migrate/20111101083437_create_fields.rb +2 -0
- data/db/migrate/20111101090312_create_field_groups.rb +2 -0
- data/db/migrate/20111116091952_add_field_groups_tag_id.rb +2 -0
- data/db/migrate/20111117041311_change_fields_collection_to_text.rb +2 -0
- data/db/migrate/20111201030535_add_field_groups_klass_name.rb +2 -0
- data/db/migrate/20120121054235_create_lists.rb +2 -0
- data/db/migrate/20120216031616_create_versions.rb +4 -2
- data/db/migrate/20120216042541_is_paranoid_to_paper_trail.rb +2 -0
- data/db/migrate/20120220233724_add_versions_object_changes.rb +2 -0
- data/db/migrate/20120224073107_remove_default_value_and_clear_settings.rb +2 -0
- data/db/migrate/20120309070209_add_versions_related.rb +2 -0
- data/db/migrate/20120314080441_add_subscribed_users_to_entities.rb +2 -0
- data/db/migrate/20120316045804_activities_to_versions.rb +13 -12
- data/db/migrate/20120405080727_change_subscribed_users_to_set.rb +2 -0
- data/db/migrate/20120405080742_change_further_subscribed_users_to_set.rb +2 -0
- data/db/migrate/20120406082136_create_groups.rb +2 -0
- data/db/migrate/20120413034923_add_index_on_versions_item_type.rb +2 -0
- data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +5 -4
- data/db/migrate/20120528102124_increase_length_of_version_events.rb +2 -0
- data/db/migrate/20120801032706_add_pair_id_to_fields.rb +2 -0
- data/db/migrate/20121003063155_add_settings_to_custom_fields.rb +2 -0
- data/db/migrate/20121221033947_fix_country_mapping.rb +2 -0
- data/db/migrate/20131207033244_add_user_id_to_lists.rb +2 -0
- data/db/migrate/20140916011927_add_created_at_index_on_versions.rb +2 -0
- data/db/migrate/20140916012922_add_indexes_to_model_associations.rb +2 -0
- data/db/migrate/20141126031837_increase_email_to254_chars.rb +2 -0
- data/db/migrate/20141230021159_add_transaction_id_column_to_versions.rb +2 -0
- data/db/migrate/20141230205453_add_missing_unique_indices.acts_as_taggable_on_engine.rb +2 -0
- data/db/migrate/20141230205454_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +2 -0
- data/db/migrate/20141230205455_add_missing_taggable_index.acts_as_taggable_on_engine.rb +2 -0
- data/db/migrate/20150123060900_convert_radio_to_radio_buttons.rb +2 -0
- data/db/migrate/20150227123054_remove_last_request_at_from_users.rb +2 -0
- data/db/migrate/20150427131956_create_index_related_type.rb +2 -0
- data/db/migrate/20160511053730_add_account_contacts_index.rb +2 -0
- data/db/migrate/20180102075234_add_account_counter_caches.rb +24 -0
- data/db/migrate/20180103223438_add_minlength_to_field.rb +7 -0
- data/db/schema.rb +300 -316
- data/db/seeds.rb +1 -0
- data/db/seeds/fields.rb +2 -0
- data/fat_free_crm.gemspec +4 -4
- data/lib/development_tasks/gem.rake +2 -0
- data/lib/development_tasks/license.rake +2 -0
- data/lib/development_tasks/rdoc.rake +2 -0
- data/lib/development_tasks/rspec.rake +2 -0
- data/lib/fat_free_crm.rb +2 -0
- data/lib/fat_free_crm/callback.rb +2 -0
- data/lib/fat_free_crm/comment_extensions.rb +2 -0
- data/lib/fat_free_crm/core_ext.rb +2 -0
- data/lib/fat_free_crm/core_ext/alias_method_chain.rb +7 -6
- data/lib/fat_free_crm/core_ext/nil.rb +2 -0
- data/lib/fat_free_crm/core_ext/string.rb +4 -2
- data/lib/fat_free_crm/custom_fields.rb +2 -0
- data/lib/fat_free_crm/engine.rb +2 -0
- data/lib/fat_free_crm/errors.rb +2 -0
- data/lib/fat_free_crm/exceptions.rb +2 -0
- data/lib/fat_free_crm/export_csv.rb +3 -1
- data/lib/fat_free_crm/exportable.rb +2 -0
- data/lib/fat_free_crm/fields.rb +2 -0
- data/lib/fat_free_crm/gem_dependencies.rb +2 -0
- data/lib/fat_free_crm/gem_ext.rb +2 -0
- data/lib/fat_free_crm/gem_ext/action_controller/base.rb +2 -0
- data/lib/fat_free_crm/gem_ext/active_support/buffered_logger.rb +4 -2
- data/lib/fat_free_crm/gem_ext/rails/engine.rb +9 -8
- data/lib/fat_free_crm/gem_ext/rake/task.rb +2 -0
- data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +2 -0
- data/lib/fat_free_crm/i18n.rb +2 -0
- data/lib/fat_free_crm/load_settings.rb +2 -0
- data/lib/fat_free_crm/mail_processor/base.rb +11 -8
- data/lib/fat_free_crm/mail_processor/comment_replies.rb +2 -0
- data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -3
- data/lib/fat_free_crm/permissions.rb +8 -9
- data/lib/fat_free_crm/renderers.rb +2 -0
- data/lib/fat_free_crm/secret_token_generator.rb +2 -0
- data/lib/fat_free_crm/sortable.rb +2 -0
- data/lib/fat_free_crm/tabs.rb +2 -0
- data/lib/fat_free_crm/version.rb +4 -2
- data/lib/fat_free_crm/view_factory.rb +3 -1
- data/lib/gravatar_image_tag.rb +2 -0
- data/lib/missing_translation_detector.rb +2 -0
- data/lib/tasks/ffcrm/comment_replies.rake +2 -0
- data/lib/tasks/ffcrm/config.rake +2 -0
- data/lib/tasks/ffcrm/demo.rake +3 -1
- data/lib/tasks/ffcrm/dropbox.rake +2 -0
- data/lib/tasks/ffcrm/missing_translations.rake +8 -7
- data/lib/tasks/ffcrm/secret.rake +2 -0
- data/lib/tasks/ffcrm/settings.rake +2 -0
- data/lib/tasks/ffcrm/setup.rake +2 -0
- data/lib/tasks/ffcrm/update_data.rake +98 -96
- data/script/rails +4 -2
- data/spec/controllers/admin/groups_controller_spec.rb +2 -0
- data/spec/controllers/admin/users_controller_spec.rb +3 -1
- data/spec/controllers/applications_controller_spec.rb +2 -0
- data/spec/controllers/authentications_controller_spec.rb +2 -0
- data/spec/controllers/comments_controller_spec.rb +3 -1
- data/spec/controllers/emails_controller_spec.rb +3 -1
- data/spec/controllers/entities/accounts_controller_spec.rb +4 -2
- data/spec/controllers/entities/campaigns_controller_spec.rb +4 -2
- data/spec/controllers/entities/contacts_controller_spec.rb +4 -2
- data/spec/controllers/entities/leads_controller_spec.rb +4 -2
- data/spec/controllers/entities/opportunities_controller_spec.rb +4 -2
- data/spec/controllers/entities_controller_spec.rb +2 -0
- data/spec/controllers/home_controller_spec.rb +14 -10
- data/spec/controllers/lists_controller_spec.rb +2 -0
- data/spec/controllers/passwords_controller_spec.rb +2 -0
- data/spec/controllers/tasks_controller_spec.rb +3 -1
- data/spec/controllers/users_controller_spec.rb +20 -18
- data/spec/factories/account_factories.rb +2 -0
- data/spec/factories/campaign_factories.rb +2 -0
- data/spec/factories/contact_factories.rb +2 -0
- data/spec/factories/field_factories.rb +2 -0
- data/spec/factories/lead_factories.rb +2 -0
- data/spec/factories/list_factories.rb +2 -0
- data/spec/factories/opportunity_factories.rb +2 -0
- data/spec/factories/sequences.rb +4 -2
- data/spec/factories/setting_factories.rb +2 -0
- data/spec/factories/shared_factories.rb +3 -1
- data/spec/factories/subscription_factories.rb +2 -0
- data/spec/factories/tag_factories.rb +2 -0
- data/spec/factories/task_factories.rb +2 -0
- data/spec/factories/user_factories.rb +3 -1
- data/spec/features/acceptance_helper.rb +2 -0
- data/spec/features/accounts_spec.rb +5 -1
- data/spec/features/admin/groups_spec.rb +4 -3
- data/spec/features/admin/users_spec.rb +4 -3
- data/spec/features/campaigns_spec.rb +2 -1
- data/spec/features/contacts_spec.rb +3 -1
- data/spec/features/dashboard_spec.rb +2 -1
- data/spec/features/leads_spec.rb +7 -2
- data/spec/features/opportunities_overview_spec.rb +2 -1
- data/spec/features/opportunities_spec.rb +3 -2
- data/spec/features/support/browser.rb +2 -0
- data/spec/features/support/headless.rb +2 -0
- data/spec/features/support/helpers.rb +2 -0
- data/spec/features/support/maintain_sessions.rb +2 -0
- data/spec/features/support/paths.rb +2 -0
- data/spec/features/support/selector_helpers.rb +2 -6
- data/spec/features/tasks_spec.rb +8 -7
- data/spec/helpers/accounts_helper_spec.rb +2 -0
- data/spec/helpers/admin/field_groups_helper_spec.rb +2 -0
- data/spec/helpers/admin/plugins_helper_spec.rb +2 -0
- data/spec/helpers/admin/settings_helper_spec.rb +2 -0
- data/spec/helpers/admin/users_helper_spec.rb +2 -0
- data/spec/helpers/application_helper_spec.rb +6 -3
- data/spec/helpers/authentications_helper_spec.rb +2 -0
- data/spec/helpers/campaigns_helper_spec.rb +2 -0
- data/spec/helpers/comments_helper_spec.rb +2 -0
- data/spec/helpers/contacts_helper_spec.rb +2 -0
- data/spec/helpers/emails_helper_spec.rb +2 -0
- data/spec/helpers/fields_helper_spec.rb +2 -0
- data/spec/helpers/groups_helper_spec.rb +2 -0
- data/spec/helpers/home_helper_spec.rb +2 -0
- data/spec/helpers/leads_helper_spec.rb +2 -0
- data/spec/helpers/lists_helper_spec.rb +2 -0
- data/spec/helpers/opportunities_helper_spec.rb +2 -0
- data/spec/helpers/passwords_helper_spec.rb +2 -0
- data/spec/helpers/tasks_helper_spec.rb +2 -0
- data/spec/helpers/users_helper_spec.rb +2 -0
- data/spec/lib/comment_extensions_spec.rb +2 -0
- data/spec/lib/core_ext/string_spec.rb +2 -0
- data/spec/lib/errors_spec.rb +2 -0
- data/spec/lib/fields_spec.rb +2 -0
- data/spec/lib/mail_processor/base_spec.rb +2 -0
- data/spec/lib/mail_processor/comment_replies_spec.rb +2 -0
- data/spec/lib/mail_processor/dropbox_spec.rb +2 -0
- data/spec/lib/mail_processor/sample_emails/dropbox.rb +166 -164
- data/spec/lib/permissions_spec.rb +2 -0
- data/spec/lib/secret_token_generator_spec.rb +2 -0
- data/spec/lib/view_factory_spec.rb +2 -0
- data/spec/mailers/subscription_mailer_spec.rb +15 -16
- data/spec/mailers/user_mailer_spec.rb +2 -0
- data/spec/models/entities/account_contact_spec.rb +3 -0
- data/spec/models/entities/account_opportunity_spec.rb +3 -0
- data/spec/models/entities/account_spec.rb +3 -1
- data/spec/models/entities/campaign_spec.rb +3 -1
- data/spec/models/entities/contact_opportunity_spec.rb +2 -0
- data/spec/models/entities/contact_spec.rb +35 -21
- data/spec/models/entities/lead_spec.rb +3 -1
- data/spec/models/entities/opportunity_spec.rb +39 -27
- data/spec/models/fields/custom_field_date_pair_spec.rb +2 -0
- data/spec/models/fields/custom_field_pair_spec.rb +2 -0
- data/spec/models/fields/custom_field_spec.rb +2 -0
- data/spec/models/fields/field_group_spec.rb +2 -0
- data/spec/models/fields/field_spec.rb +8 -4
- data/spec/models/list_spec.rb +2 -0
- data/spec/models/observers/entity_observer_spec.rb +2 -0
- data/spec/models/polymorphic/address_spec.rb +2 -4
- data/spec/models/polymorphic/avatar_spec.rb +2 -0
- data/spec/models/polymorphic/comment_spec.rb +2 -4
- data/spec/models/polymorphic/email_spec.rb +2 -0
- data/spec/models/polymorphic/task_spec.rb +6 -4
- data/spec/models/polymorphic/version_spec.rb +7 -10
- data/spec/models/setting_spec.rb +23 -0
- data/spec/models/users/abilities/user_ability_spec.rb +2 -0
- data/spec/models/users/authentication_spec.rb +2 -0
- data/spec/models/users/group_spec.rb +2 -0
- data/spec/models/users/permission_spec.rb +2 -0
- data/spec/models/users/preference_spec.rb +2 -0
- data/spec/models/users/user_spec.rb +11 -17
- data/spec/routing/accounts_routing_spec.rb +2 -0
- data/spec/routing/admin/users_routing_spec.rb +2 -0
- data/spec/routing/campaigns_routing_spec.rb +2 -0
- data/spec/routing/comments_routing_spec.rb +2 -0
- data/spec/routing/contacts_routing_spec.rb +2 -0
- data/spec/routing/emails_routing_spec.rb +2 -0
- data/spec/routing/leads_routing_spec.rb +2 -0
- data/spec/routing/opportunities_routing_spec.rb +2 -0
- data/spec/routing/tasks_routing_spec.rb +2 -0
- data/spec/routing/users_routing_spec.rb +2 -0
- data/spec/shared/controllers.rb +2 -0
- data/spec/shared/models.rb +2 -0
- data/spec/spec_helper.rb +7 -5
- data/spec/support/assert_select.rb +2 -0
- data/spec/support/auth_macros.rb +5 -12
- data/spec/support/macros.rb +9 -7
- data/spec/support/mail_processor_mocks.rb +2 -0
- data/spec/support/uploaded_file.rb +2 -0
- data/spec/views/accounts/_edit.haml_spec.rb +4 -3
- data/spec/views/accounts/_new.haml_spec.rb +3 -1
- data/spec/views/accounts/create.js.haml_spec.rb +3 -1
- data/spec/views/accounts/destroy.js.haml_spec.rb +3 -1
- data/spec/views/accounts/edit.js.haml_spec.rb +3 -1
- data/spec/views/accounts/index.haml_spec.rb +3 -1
- data/spec/views/accounts/index.js.haml_spec.rb +3 -1
- data/spec/views/accounts/new.js.haml_spec.rb +3 -1
- data/spec/views/accounts/show.haml_spec.rb +6 -1
- data/spec/views/accounts/update.js.haml_spec.rb +3 -1
- data/spec/views/admin/field_groups/create.js.haml_spec.rb +3 -1
- data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +3 -1
- data/spec/views/admin/field_groups/edit.js.haml_spec.rb +3 -1
- data/spec/views/admin/field_groups/new.js.haml_spec.rb +3 -1
- data/spec/views/admin/field_groups/update.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/_create.haml_spec.rb +3 -1
- data/spec/views/admin/users/create.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/destroy.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/edit.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/index.haml_spec.rb +3 -1
- data/spec/views/admin/users/index.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/new.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/reactivate.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/show.haml_spec.rb +2 -0
- data/spec/views/admin/users/suspend.js.haml_spec.rb +3 -1
- data/spec/views/admin/users/update.js.haml_spec.rb +3 -1
- data/spec/views/application/auto_complete.haml_spec.rb +3 -1
- data/spec/views/authentications/new.haml_spec.rb +2 -0
- data/spec/views/campaigns/_edit.haml_spec.rb +3 -1
- data/spec/views/campaigns/_new.haml_spec.rb +3 -1
- data/spec/views/campaigns/create.js.haml_spec.rb +3 -1
- data/spec/views/campaigns/destroy.js.haml_spec.rb +3 -1
- data/spec/views/campaigns/edit.js.haml_spec.rb +3 -1
- data/spec/views/campaigns/index.haml_spec.rb +3 -1
- data/spec/views/campaigns/index.js.haml_spec.rb +3 -1
- data/spec/views/campaigns/new.js.haml_spec.rb +3 -1
- data/spec/views/campaigns/show.haml_spec.rb +6 -1
- data/spec/views/campaigns/update.js.haml_spec.rb +3 -1
- data/spec/views/comments/edit.js.haml_spec.rb +5 -4
- data/spec/views/contacts/_edit.haml_spec.rb +3 -1
- data/spec/views/contacts/_new.haml_spec.rb +3 -1
- data/spec/views/contacts/create.js.haml_spec.rb +3 -1
- data/spec/views/contacts/destroy.js.haml_spec.rb +3 -1
- data/spec/views/contacts/edit.js.haml_spec.rb +3 -1
- data/spec/views/contacts/index.haml_spec.rb +3 -1
- data/spec/views/contacts/index.js.html_spec.rb +3 -1
- data/spec/views/contacts/new.js.haml_spec.rb +3 -1
- data/spec/views/contacts/show.haml_spec.rb +6 -1
- data/spec/views/contacts/update.js.haml_spec.rb +3 -1
- data/spec/views/home/index.haml_spec.rb +3 -1
- data/spec/views/home/index.js.haml_spec.rb +3 -1
- data/spec/views/home/options.js.haml_spec.rb +4 -2
- data/spec/views/leads/_convert.haml_spec.rb +3 -1
- data/spec/views/leads/_edit.haml_spec.rb +3 -1
- data/spec/views/leads/_new.haml_spec.rb +3 -1
- data/spec/views/leads/_sidebar_show.haml_spec.rb +3 -1
- data/spec/views/leads/convert.js.haml_spec.rb +3 -1
- data/spec/views/leads/create.js.haml_spec.rb +3 -1
- data/spec/views/leads/destroy.js.haml_spec.rb +3 -1
- data/spec/views/leads/edit.js.haml_spec.rb +3 -1
- data/spec/views/leads/index.haml_spec.rb +3 -1
- data/spec/views/leads/index.js.haml_spec.rb +3 -1
- data/spec/views/leads/new.js.haml_spec.rb +3 -1
- data/spec/views/leads/promote.js.haml_spec.rb +3 -1
- data/spec/views/leads/reject.js.haml_spec.rb +3 -1
- data/spec/views/leads/show.haml_spec.rb +6 -1
- data/spec/views/leads/update.js.haml_spec.rb +3 -1
- data/spec/views/opportunities/_edit.haml_spec.rb +3 -1
- data/spec/views/opportunities/_new.haml_spec.rb +3 -1
- data/spec/views/opportunities/create.js.haml_spec.rb +3 -1
- data/spec/views/opportunities/destroy.js.haml_spec.rb +3 -1
- data/spec/views/opportunities/edit.js.haml_spec.rb +3 -1
- data/spec/views/opportunities/index.haml_spec.rb +3 -1
- data/spec/views/opportunities/index.js.haml_spec.rb +3 -1
- data/spec/views/opportunities/new.js.haml_spec.rb +3 -1
- data/spec/views/opportunities/show.haml_spec.rb +6 -1
- data/spec/views/opportunities/update.js.haml_spec.rb +3 -1
- data/spec/views/tasks/_edit.haml_spec.rb +3 -1
- data/spec/views/tasks/complete.js.haml_spec.rb +3 -1
- data/spec/views/tasks/create.js.haml_spec.rb +3 -1
- data/spec/views/tasks/destroy.js.haml_spec.rb +3 -1
- data/spec/views/tasks/edit.js.haml_spec.rb +3 -1
- data/spec/views/tasks/index.haml_spec.rb +6 -4
- data/spec/views/tasks/new.js.haml_spec.rb +3 -1
- data/spec/views/tasks/uncomplete.js.haml_spec.rb +3 -1
- data/spec/views/tasks/update.js.haml_spec.rb +3 -1
- data/spec/views/users/avatar.js.haml_spec.rb +3 -1
- data/spec/views/users/change_password.js.haml_spec.rb +3 -1
- data/spec/views/users/edit.js.haml_spec.rb +3 -1
- data/spec/views/users/password.js.haml_spec.rb +3 -1
- data/spec/views/users/update.js.haml_spec.rb +3 -1
- data/spec/views/users/upload_avatar.js.haml_spec.rb +4 -2
- data/vendor/assets/javascripts/textarea_autocomplete.js +1 -1
- data/vendor/gems/globby-0.1.2/lib/globby/glob.rb +1 -1
- metadata +8 -12
- data/app/assets/javascripts/crm_chosen.js.coffee +0 -29
- data/app/assets/stylesheets/ffcrm_chosen.scss +0 -69
- data/vendor/assets/javascripts/ajax-chosen-jquery.js +0 -2
- data/vendor/assets/javascripts/ajax-chosen.jquery.coffee +0 -171
- data/vendor/assets/javascripts/chosen-jquery.js +0 -3
- data/vendor/assets/javascripts/chosen.jquery.coffee +0 -574
- data/vendor/assets/javascripts/lib/abstract-chosen.coffee +0 -110
- data/vendor/assets/stylesheets/chosen.css.sass +0 -361
@@ -15,7 +15,7 @@
|
|
15
15
|
- if campaign.starts_on > Date.today
|
16
16
|
= t(:starts_in, distance_of_time_in_words(Date.today, campaign.starts_on))
|
17
17
|
- elsif campaign.starts_on < Date.today
|
18
|
-
%span.warn= t(:was_supposed_to_start, :
|
18
|
+
%span.warn= t(:was_supposed_to_start, time_ago: distance_of_time_in_words(campaign.starts_on, Date.today), start_date: campaign.starts_on.strftime('%b %e, %Y'))
|
19
19
|
- else
|
20
20
|
%span.cool #{t :starts_today}
|
21
21
|
- else
|
@@ -1,11 +1,11 @@
|
|
1
1
|
#confirm{ hidden }
|
2
2
|
.title_tools#menu
|
3
|
-
= link_to_inline(:edit_campaign, edit_campaign_path(@campaign), :
|
3
|
+
= link_to_inline(:edit_campaign, edit_campaign_path(@campaign), text: t(:edit)) + " | "
|
4
4
|
= link_to_function(t(:delete) + '?', confirm_delete(@campaign))
|
5
5
|
.title_tools#buttons
|
6
6
|
= view_buttons
|
7
7
|
.title#edit_campaign_title
|
8
8
|
= h(@campaign.name)
|
9
|
-
= image_tag("loading.gif", :
|
9
|
+
= image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
|
10
10
|
|
11
11
|
%div#edit_campaign{ hidden }
|
@@ -1,29 +1,29 @@
|
|
1
|
-
= hook(:campaign_top_section, self, :
|
1
|
+
= hook(:campaign_top_section, self, f: f) do
|
2
2
|
.section
|
3
3
|
%table
|
4
4
|
%tr
|
5
5
|
%td(colspan="5")
|
6
6
|
.label.top.req #{t :name}:
|
7
|
-
= f.text_field :name, :
|
7
|
+
= f.text_field :name, autofocus: true, style: "width:500px"
|
8
8
|
%tr
|
9
9
|
%td
|
10
10
|
.label #{t :start_date}:
|
11
|
-
= f.text_field :starts_on, :
|
11
|
+
= f.text_field :starts_on, value: f.object.starts_on, style: "width:110px", autocomplete: :off, class: 'date'
|
12
12
|
%td= spacer
|
13
13
|
%td
|
14
14
|
.label #{t :end_date}:
|
15
|
-
= f.text_field :ends_on, :
|
15
|
+
= f.text_field :ends_on, value: f.object.ends_on, style: "width:110px", autocomplete: :off, class: 'date'
|
16
16
|
%td= spacer
|
17
17
|
%td
|
18
18
|
.label #{t :status}:
|
19
|
-
= f.select :status, Setting.unroll(:campaign_status), { :
|
19
|
+
= f.select :status, Setting.unroll(:campaign_status), { selected: (@campaign.status || "planned").to_sym }, { style: "width:250px", class: 'select2' }
|
20
20
|
|
21
21
|
- if Setting.background_info && Setting.background_info.include?(:campaign)
|
22
22
|
%tr
|
23
23
|
%td(colspan="5")
|
24
|
-
.label= t(:background_info)
|
25
|
-
= f.text_area :background_info, :
|
24
|
+
.label= t(:background_info) + ':'
|
25
|
+
= f.text_area :background_info, style: "width:500px", rows: 3
|
26
26
|
|
27
|
-
= render :
|
27
|
+
= render partial: "/shared/tags", locals: {f: f, span: 5}
|
28
28
|
|
29
|
-
= hook(:campaign_top_section_bottom, self, :
|
29
|
+
= hook(:campaign_top_section_bottom, self, f: f)
|
@@ -6,13 +6,13 @@
|
|
6
6
|
$('##{create_id}_arrow').html(crm.COLLAPSED);
|
7
7
|
$('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
|
8
8
|
$('##{create_id}').slideUp(250);
|
9
|
-
$('##{entity_name.pluralize}').prepend('#{ j render(:
|
9
|
+
$('##{entity_name.pluralize}').prepend('#{ j render(partial: entity_name, collection: [ @entity ]) }');
|
10
10
|
$('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
|
11
11
|
= refresh_sidebar(:index, :filters)
|
12
|
-
$('#paginate').html('#{ j render(:
|
12
|
+
$('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
|
13
13
|
crm.flick('empty', 'remove');
|
14
14
|
- else
|
15
|
-
$('##{create_id}').html('#{ j render(:
|
15
|
+
$('##{create_id}').html('#{ j render(partial: "new") }');
|
16
16
|
$('##{create_id}').effect("shake", { duration:250, distance: 6 });
|
17
17
|
- if @entity.errors[:name].blank? and @entity.errors[:ends_on].present?
|
18
18
|
$('#campaign_ends_on').focus();
|
@@ -3,4 +3,4 @@
|
|
3
3
|
|
4
4
|
$('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250)
|
5
5
|
= refresh_sidebar(:index, :filters)
|
6
|
-
$('#paginate').replaceWith('#{ j render(:
|
6
|
+
$('#paginate').replaceWith('#{ j render(partial: "shared/paginate_with_per_page") }');
|
@@ -8,14 +8,14 @@
|
|
8
8
|
crm.flip_form('edit_#{entity_name}');
|
9
9
|
crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
|
10
10
|
- else # Called from index page...
|
11
|
-
$('##{id}').replaceWith('#{ j render(:
|
11
|
+
$('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
|
12
12
|
|
13
13
|
- else # <---------------------------------------- Show [Edit] form.
|
14
14
|
|
15
15
|
- if params[:cancel].blank? # Called from index page...
|
16
16
|
- if @previous # Hide open [Edit] form if any.
|
17
17
|
- if @previous.is_a?(@entity.class)
|
18
|
-
$('##{dom_id(@previous)}').replaceWith('#{ j render(:
|
18
|
+
$('##{dom_id(@previous)}').replaceWith('#{ j render(partial: entity_name, collection: [ @previous ]) }');
|
19
19
|
- else
|
20
20
|
crm.flick('#{entity_name}_#{@previous}', 'remove');
|
21
21
|
-# Disable onMouseOver for the list item.
|
@@ -23,9 +23,9 @@
|
|
23
23
|
-# Hide [Create] form if any.
|
24
24
|
crm.hide_form('create_#{entity_name}');
|
25
25
|
-# Show [Edit] form.
|
26
|
-
$('##{id}').html('#{ j render(:
|
26
|
+
$('##{id}').html('#{ j render(partial: "edit") }');
|
27
27
|
|
28
28
|
- elsif params[:cancel].false? # Called from title of the landing page...
|
29
|
-
$('#edit_#{entity_name}').html('#{ j render(:
|
29
|
+
$('#edit_#{entity_name}').html('#{ j render(partial: "edit") }');
|
30
30
|
crm.flip_form('edit_#{entity_name}');
|
31
31
|
crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.name}");
|
@@ -4,8 +4,8 @@
|
|
4
4
|
- if @entities.any?
|
5
5
|
$('##{entities}').html('#{ j render(@entities) }');
|
6
6
|
- else
|
7
|
-
$('##{entities}').html('#{ j render(:
|
7
|
+
$('##{entities}').html('#{ j render(partial: "shared/empty") }');
|
8
8
|
|
9
|
-
$('#paginate').html('#{ j render(:
|
10
|
-
$('#export').html('#{ j render(:
|
11
|
-
$('#search_results_count').html('#{ j render(:
|
9
|
+
$('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
|
10
|
+
$('#export').html('#{ j render(partial: "shared/export") }');
|
11
|
+
$('#search_results_count').html('#{ j render(plain: t('search_results_count', count: @search_results_count)) }');
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
|
2
4
|
xml.Table do
|
3
5
|
unless @campaigns.empty?
|
@@ -39,25 +41,25 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
|
|
39
41
|
# Campaign rows.
|
40
42
|
@campaigns.each do |campaign|
|
41
43
|
xml.Row do
|
42
|
-
data
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
44
|
+
data = [campaign.id,
|
45
|
+
campaign.user.try(:name),
|
46
|
+
campaign.assignee.try(:name),
|
47
|
+
campaign.name,
|
48
|
+
campaign.access,
|
49
|
+
campaign.status,
|
50
|
+
campaign.budget,
|
51
|
+
campaign.target_leads,
|
52
|
+
campaign.target_conversion,
|
53
|
+
campaign.target_revenue,
|
54
|
+
campaign.leads_count,
|
55
|
+
campaign.opportunities_count,
|
56
|
+
campaign.revenue,
|
57
|
+
campaign.starts_on,
|
58
|
+
campaign.ends_on,
|
59
|
+
campaign.objectives,
|
60
|
+
campaign.background_info,
|
61
|
+
campaign.created_at,
|
62
|
+
campaign.updated_at]
|
61
63
|
|
62
64
|
# Append custom field values.
|
63
65
|
Campaign.fields.each do |field|
|
@@ -67,7 +69,7 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
|
|
67
69
|
data.each do |value|
|
68
70
|
xml.Cell do
|
69
71
|
xml.Data value,
|
70
|
-
'ss:Type' =>
|
72
|
+
'ss:Type' => (value.respond_to?(:abs) ? 'Number' : 'String').to_s
|
71
73
|
end
|
72
74
|
end
|
73
75
|
end
|
@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
|
|
5
5
|
crm.flip_form('#{create_id}');
|
6
6
|
|
7
7
|
- unless params[:cancel].true?
|
8
|
-
$('##{create_id}').html('#{ j render(:
|
8
|
+
$('##{create_id}').html('#{ j render(partial: "new") }');
|
9
9
|
crm.set_title('#{create_id}', '#{ j t(create_id) }');
|
10
10
|
- else
|
11
11
|
crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');
|
@@ -1,26 +1,26 @@
|
|
1
1
|
- if (template = template_for_current_view)
|
2
|
-
= render(template, :
|
2
|
+
= render(template, campaign: @campaign)
|
3
3
|
- else
|
4
4
|
|
5
5
|
-# default view
|
6
6
|
|
7
7
|
= styles_for :task, :lead, :opportunity
|
8
8
|
|
9
|
-
= render 'campaigns/title_bar', :
|
9
|
+
= render 'campaigns/title_bar', campaign: @campaign
|
10
10
|
|
11
|
-
= render "comments/new", :
|
12
|
-
= render :
|
11
|
+
= render "comments/new", commentable: @campaign
|
12
|
+
= render partial: "shared/timeline", collection: @timeline
|
13
13
|
|
14
14
|
= hook(:show_campaign_bottom, self, {entity: @campaign}) do
|
15
15
|
|
16
|
-
= render "tasks/tasks", :
|
16
|
+
= render "tasks/tasks", object: @campaign
|
17
17
|
|
18
|
-
= render "leads/leads", :
|
18
|
+
= render "leads/leads", object: @campaign
|
19
19
|
|
20
|
-
= render "opportunities/opportunities", :
|
20
|
+
= render "opportunities/opportunities", object: @campaign
|
21
21
|
|
22
|
-
= render "versions/versions", :
|
22
|
+
= render "versions/versions", object: @campaign
|
23
23
|
|
24
24
|
= load_select_popups_for(@campaign, :tasks, :leads, :opportunities)
|
25
25
|
|
26
|
-
#export= render "shared/export", :
|
26
|
+
#export= render "shared/export", action: :show
|
@@ -1,5 +1,5 @@
|
|
1
1
|
- entity_name = controller.controller_name.singularize.underscore #account
|
2
2
|
- @entity = instance_variable_get("@#{entity_name}")
|
3
3
|
|
4
|
-
$('#main').html('#{ j (render :
|
4
|
+
$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
|
5
5
|
= raw generate_js_for_popups(@entity, :tasks, :leads, :opportunities)
|
@@ -8,11 +8,11 @@
|
|
8
8
|
crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
|
9
9
|
= refresh_sidebar(:show, :summary)
|
10
10
|
- else
|
11
|
-
$('##{id}').replaceWith('#{ j render(:
|
11
|
+
$('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
|
12
12
|
$('##{id}').effect("highlight", { duration:1500 });
|
13
13
|
= refresh_sidebar(:index, :filters)
|
14
14
|
- else
|
15
|
-
$('##{id}').html('#{ j render(:
|
15
|
+
$('##{id}').html('#{ j render(partial: "edit") }');
|
16
16
|
$('##{id}').effect("shake", { duration:250, distance: 6 });
|
17
17
|
- if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
|
18
18
|
$('#campaign_ends_on').focus();
|
@@ -1,11 +1,11 @@
|
|
1
|
-
- truncated = simple_format(truncate(comment.comment.gsub("\n", " "), :
|
1
|
+
- truncated = simple_format(truncate(comment.comment.gsub("\n", " "), length: 125))
|
2
2
|
- formatted = defined?(RedCloth) ? RedCloth.new(comment.comment).to_html : simple_format(comment.comment)
|
3
3
|
- collapsable = formatted.size > 150
|
4
4
|
- commentable = comment.commentable
|
5
5
|
|
6
6
|
%li.comment.highlight[comment]
|
7
7
|
.body
|
8
|
-
= link_to avatar_for(comment.user, :
|
8
|
+
= link_to avatar_for(comment.user, size: :small), user_path(comment.user)
|
9
9
|
%ul.tools
|
10
10
|
- if can?(:update, commentable)
|
11
11
|
%li= link_to_edit(comment)
|
@@ -17,13 +17,13 @@
|
|
17
17
|
= t(:added_note, value: timeago(comment.created_at) ).html_safe
|
18
18
|
- if collapsable && can?(:read, commentable)
|
19
19
|
= " | "
|
20
|
-
= link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :
|
20
|
+
= link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", class: "toggle")
|
21
21
|
|
22
22
|
- if can?(:read, commentable)
|
23
23
|
- if collapsable
|
24
|
-
%dt{ hidden_if(comment.expanded?), :
|
24
|
+
%dt{ hidden_if(comment.expanded?), id: dom_id(comment, :truncated) }
|
25
25
|
= truncated
|
26
|
-
%dt.textile{ hidden_if(comment.collapsed?), :
|
26
|
+
%dt.textile{ hidden_if(comment.collapsed?), id: dom_id(comment, :formatted) }
|
27
27
|
= sanitize auto_link(formatted)
|
28
28
|
- else
|
29
29
|
%dt.textile= sanitize auto_link(formatted)
|
@@ -1,11 +1,11 @@
|
|
1
1
|
- class_name = commentable.class.name.underscore
|
2
|
-
.comment{:
|
3
|
-
= link_to avatar_for(current_user, :
|
4
|
-
= form_for(@comment, :
|
2
|
+
.comment{style: "margin: 5px 0px 0px 0px"}
|
3
|
+
= link_to avatar_for(current_user, size: :small), user_path(current_user)
|
4
|
+
= form_for(@comment, remote: true) do |f|
|
5
5
|
= hidden_field_tag "comment[commentable_id]", commentable.id
|
6
6
|
= hidden_field_tag "comment[commentable_type]", class_name.classify
|
7
|
-
= f.text_area :comment, :
|
7
|
+
= f.text_area :comment, id: dom_id(@comment, :text)
|
8
8
|
.buttons
|
9
9
|
= f.submit t(:save_note)
|
10
10
|
#{t :or}
|
11
|
-
= link_to(t(:cancel), edit_comment_path(@comment, "#{class_name}_id" => commentable.id, :
|
11
|
+
= link_to(t(:cancel), edit_comment_path(@comment, "#{class_name}_id" => commentable.id, cancel: true), remote: true)
|
@@ -1,7 +1,7 @@
|
|
1
1
|
- class_name = commentable.class.name.underscore
|
2
2
|
- id_prefix = "#{class_name}_#{commentable.id}"
|
3
3
|
- @comment = @comment || Comment.new
|
4
|
-
.comment.highlight.new_comment{ :
|
4
|
+
.comment.highlight.new_comment{ id: "#{id_prefix}_comment_new" }
|
5
5
|
- subscribed_users = commentable.subscribed_users.map{|uid| User.find_by_id(uid) unless uid == current_user.id }.compact
|
6
6
|
- if notification_emails_configured? && subscribed_users.any?
|
7
7
|
= t(:following_users_will_be_notified) << ":"
|
@@ -10,26 +10,26 @@
|
|
10
10
|
|
11
11
|
-# Two hidden fields store the IDs of notes and emails shown for the asset. These IDs are used
|
12
12
|
-# by [Expand/Collapse All]. The contents gets updated by actions such as [Add] or [Delete].
|
13
|
-
= hidden_field_tag :shown_notes, "#{commentable.comment_ids.join(',')}", :
|
14
|
-
= hidden_field_tag :shown_emails, "#{commentable.email_ids.join(',')}", :
|
13
|
+
= hidden_field_tag :shown_notes, "#{commentable.comment_ids.join(',')}", id: "#{id_prefix}_shown_notes"
|
14
|
+
= hidden_field_tag :shown_emails, "#{commentable.email_ids.join(',')}", id: "#{id_prefix}_shown_emails"
|
15
15
|
|
16
|
-
= link_to avatar_for(current_user, :
|
16
|
+
= link_to avatar_for(current_user, size: :small), user_path(current_user)
|
17
17
|
.tools
|
18
18
|
= link_to_function(t(:expand_all), "crm.flip_notes_and_emails('#{t(:expanded)}', '#{t(:more)}', '#{t(:less)}', '#{id_prefix}')") << " | "
|
19
19
|
= link_to_function(t(:collapse_all), "crm.flip_notes_and_emails('#{t(:collapsed)}', '#{t(:more)}', '#{t(:less)}', '#{id_prefix}')")
|
20
20
|
|
21
|
-
%div{ {:
|
22
|
-
= form_for(@comment, :
|
23
|
-
= hidden_field_tag "comment[commentable_id]", commentable.id, :
|
24
|
-
= hidden_field_tag "comment[commentable_type]", class_name.classify, :
|
25
|
-
= f.text_area :comment, :
|
21
|
+
%div{ {id: "#{id_prefix}_post"}.merge(hidden_if(true))}
|
22
|
+
= form_for(@comment, remote: true, html: {id: "#{id_prefix}_new_comment"}) do |f|
|
23
|
+
= hidden_field_tag "comment[commentable_id]", commentable.id, id: "#{id_prefix}_comment_commentable_id"
|
24
|
+
= hidden_field_tag "comment[commentable_type]", class_name.classify, id: "#{id_prefix}_comment_commentable_type"
|
25
|
+
= f.text_area :comment, id: "#{id_prefix}_comment_comment"
|
26
26
|
.buttons
|
27
|
-
= image_tag("loading.gif", :
|
28
|
-
= f.submit t(:add_note), :
|
27
|
+
= image_tag("loading.gif", size: :thumb, class: "spinner", style: "display: none;")
|
28
|
+
= f.submit t(:add_note), id: "#{id_prefix}_comment_submit"
|
29
29
|
#{t :or}
|
30
|
-
= link_to(t(:cancel), '#', :
|
31
|
-
%div{ {:
|
32
|
-
= text_field_tag :post_new_note, t(:add_note_help), :
|
30
|
+
= link_to(t(:cancel), '#', class: 'cancel')
|
31
|
+
%div{ {id: "#{id_prefix}_ask"}.merge(hidden_if(false))}
|
32
|
+
= text_field_tag :post_new_note, t(:add_note_help), id: "#{id_prefix}_post_new_note"
|
33
33
|
|
34
34
|
- if notification_emails_configured?
|
35
|
-
= render :
|
35
|
+
= render partial: "comments/subscription_links", locals: {entity: commentable}
|
@@ -8,6 +8,6 @@
|
|
8
8
|
- else
|
9
9
|
- link_text, action = [t(:subscribe_via_email), "subscribe"]
|
10
10
|
|
11
|
-
%div{:
|
12
|
-
= image_tag "notifications.png", :
|
13
|
-
= link_to link_text, url_for(:
|
11
|
+
%div{id: "#{id_prefix}_subscribe", class: "comment_subscriptions"}
|
12
|
+
= image_tag "notifications.png", title: t(:notifications_tooltip)
|
13
|
+
= link_to link_text, url_for(controller: class_name.pluralize, action: action, id: entity.id), remote: true, method: :post
|
@@ -2,7 +2,7 @@
|
|
2
2
|
- id_prefix = "#{class_name}_#{@comment.commentable.id}"
|
3
3
|
|
4
4
|
- if @comment.valid?
|
5
|
-
$('##{id_prefix}_comment_new').after('#{ j (render :
|
5
|
+
$('##{id_prefix}_comment_new').after('#{ j (render partial: "comment", locals: { comment: @comment }) }');
|
6
6
|
$('##{dom_id(@comment)}').effect("highlight", { duration:1500 });
|
7
7
|
$('##{id_prefix}_post').hide();
|
8
8
|
$('##{id_prefix}_ask').show();
|
@@ -1,11 +1,11 @@
|
|
1
1
|
- id = dom_id(@comment)
|
2
2
|
|
3
3
|
- if params[:cancel].true? # <----------------- Hide [Edit Comment]
|
4
|
-
$('##{id}').replaceWith('#{ j render(:
|
4
|
+
$('##{id}').replaceWith('#{ j render(partial: "comment", collection: [ @comment ]) }');
|
5
5
|
|
6
6
|
- else # <----------------------------------------- Show [Edit Comment] form.
|
7
7
|
|
8
8
|
-# Disable onMouseOver for the list item.
|
9
9
|
crm.highlight_off('#{id}');
|
10
|
-
$('##{id}').html('#{ j render(:
|
10
|
+
$('##{id}').html('#{ j render(partial: "edit", locals: { commentable: @comment.commentable }) }');
|
11
11
|
$('##{dom_id(@comment, :text)}').focus();
|
@@ -1,9 +1,9 @@
|
|
1
1
|
- id = dom_id(@comment)
|
2
2
|
|
3
3
|
- if @comment.errors.empty?
|
4
|
-
$('##{id}').replaceWith('#{ j render(:
|
4
|
+
$('##{id}').replaceWith('#{ j render(partial: "comment", collection: [ @comment ]) }');
|
5
5
|
$('##{id}').effect("highlight", { duration:1500 });
|
6
6
|
- else
|
7
|
-
$('##{id}').html('#{ j render(:
|
7
|
+
$('##{id}').html('#{ j render(partial: "edit") }');
|
8
8
|
$('##{id}').effect("shake", { duration:250, distance: 6 });
|
9
9
|
$('#comment_comment').focus();
|
@@ -1,5 +1,5 @@
|
|
1
|
-
- if (
|
2
|
-
= render(template, :
|
1
|
+
- if (controller.controller_name == 'contacts') and (template = template_for_current_view).present?
|
2
|
+
= render(template, contact: contact)
|
3
3
|
- else
|
4
4
|
-# default view
|
5
|
-
= render 'contacts/index_long', :
|
5
|
+
= render 'contacts/index_long', contact: contact
|
@@ -1,7 +1,7 @@
|
|
1
1
|
|
2
2
|
= section(object, :contacts)
|
3
3
|
.list#contacts
|
4
|
-
- contacts = object.contacts.order('updated_at desc').paginate(:
|
5
|
-
= render :
|
4
|
+
- contacts = object.contacts.order('updated_at desc').paginate(page: 1, per_page: 20)
|
5
|
+
= render partial: "contacts/contact", collection: contacts
|
6
6
|
|
7
7
|
= paginate( collection: contacts, id: 'contacts_pagination', params: { action: 'contacts' } )
|
@@ -1,19 +1,19 @@
|
|
1
1
|
.remote
|
2
|
-
= simple_form_for(@contact, :
|
2
|
+
= simple_form_for(@contact, html: one_submit_only, remote: true) do |f|
|
3
3
|
= link_to_close edit_contact_path(@contact)
|
4
4
|
= f.hidden_field :user_id
|
5
5
|
|
6
|
-
= f.error_messages :
|
6
|
+
= f.error_messages object_name: t('contact')
|
7
7
|
|
8
|
-
= render "contacts/top_section", :
|
9
|
-
= render "fields/edit_custom_field_group", :
|
10
|
-
= render "contacts/extra", :
|
11
|
-
= render "contacts/web", :
|
12
|
-
= render "fields/groups", :
|
13
|
-
= render "entities/permissions", :
|
8
|
+
= render "contacts/top_section", f: f, edit: true
|
9
|
+
= render "fields/edit_custom_field_group", f: f, edit: true
|
10
|
+
= render "contacts/extra", f: f, edit: true
|
11
|
+
= render "contacts/web", f: f, edit: true
|
12
|
+
= render "fields/groups", f: f, edit: true
|
13
|
+
= render "entities/permissions", f: f, edit: true, entity: @contact
|
14
14
|
= hook(:entity_form, self, {f: f, entity: @contact})
|
15
15
|
|
16
16
|
.buttonbar
|
17
|
-
= f.submit t(:save_contact), :
|
17
|
+
= f.submit t(:save_contact), onclick: "crm.save_contact()"
|
18
18
|
#{t :or}
|
19
19
|
= link_to_cancel edit_contact_path(@contact)
|