fat_free_crm 0.12.3 → 0.13.0
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 -13
- data/.travis.yml +1 -11
- data/Gemfile +7 -19
- data/Gemfile.lock +166 -166
- data/Procfile +1 -1
- data/README.md +20 -20
- data/app/assets/javascripts/admin/fields.js.coffee +3 -3
- data/app/assets/javascripts/application.js.erb +3 -0
- data/app/assets/javascripts/crm.js +1 -0
- data/app/assets/javascripts/crm_comments.js.coffee +66 -0
- data/app/assets/javascripts/lists.js.coffee +45 -2
- data/app/assets/javascripts/search.js.coffee +2 -0
- data/app/assets/javascripts/timeago.js +17 -0
- data/app/assets/stylesheets/advanced_search.css.scss +49 -25
- data/app/assets/stylesheets/application.css.erb +3 -0
- data/app/assets/stylesheets/common.scss +13 -0
- data/app/assets/stylesheets/format_buttons.css.scss +15 -10
- data/app/assets/stylesheets/header.scss +3 -0
- data/app/assets/stylesheets/lists.css.scss +4 -0
- data/app/controllers/admin/fields_controller.rb +5 -5
- data/app/controllers/admin/users_controller.rb +1 -3
- data/app/controllers/application_controller.rb +23 -23
- data/app/controllers/comments_controller.rb +3 -31
- data/app/controllers/entities/accounts_controller.rb +3 -3
- data/app/controllers/entities/campaigns_controller.rb +4 -4
- data/app/controllers/entities/contacts_controller.rb +2 -2
- data/app/controllers/entities/leads_controller.rb +3 -3
- data/app/controllers/entities/opportunities_controller.rb +4 -3
- data/app/controllers/entities_controller.rb +6 -6
- data/app/controllers/home_controller.rb +1 -1
- data/app/controllers/lists_controller.rb +8 -1
- data/app/controllers/tasks_controller.rb +1 -1
- data/app/controllers/users_controller.rb +46 -23
- data/app/helpers/admin/application_helper.rb +1 -3
- data/app/helpers/admin/field_groups_helper.rb +2 -1
- data/app/helpers/application_helper.rb +37 -16
- data/app/helpers/home_helper.rb +1 -2
- data/app/helpers/leads_helper.rb +5 -6
- data/app/helpers/tasks_helper.rb +36 -50
- data/app/models/entities/account.rb +10 -7
- data/app/models/entities/campaign.rb +4 -4
- data/app/models/entities/contact.rb +8 -5
- data/app/models/entities/lead.rb +8 -8
- data/app/models/entities/opportunity.rb +13 -18
- data/app/models/fields/custom_field.rb +10 -0
- data/app/models/fields/field.rb +3 -3
- data/app/models/fields/field_group.rb +1 -1
- data/app/models/list.rb +1 -0
- data/app/models/polymorphic/address.rb +3 -3
- data/app/models/polymorphic/comment.rb +2 -4
- data/app/models/polymorphic/task.rb +32 -27
- data/app/models/setting.rb +3 -9
- data/app/models/users/ability.rb +2 -13
- data/app/models/users/user.rb +12 -15
- data/app/views/accounts/_edit.html.haml +1 -1
- data/app/views/accounts/_index_brief.html.haml +3 -3
- data/app/views/accounts/_index_long.html.haml +3 -3
- data/app/views/accounts/_new.html.haml +1 -1
- data/app/views/accounts/create.js.haml +17 -0
- data/app/views/accounts/destroy.js.haml +6 -0
- data/app/views/accounts/edit.js.haml +32 -0
- data/app/views/accounts/index.js.haml +11 -0
- data/app/views/accounts/index.xls.builder +9 -7
- data/app/views/accounts/new.js.haml +11 -0
- data/app/views/accounts/show.js.haml +5 -0
- data/app/views/accounts/update.js.haml +17 -0
- data/app/views/admin/field_groups/_edit.html.haml +1 -1
- data/app/views/admin/field_groups/_new.html.haml +1 -1
- data/app/views/admin/field_groups/confirm.js.haml +7 -0
- data/app/views/admin/field_groups/create.js.haml +20 -0
- data/app/views/admin/field_groups/destroy.js.haml +9 -0
- data/app/views/admin/field_groups/edit.js.haml +12 -0
- data/app/views/admin/field_groups/new.js.haml +8 -0
- data/app/views/admin/field_groups/update.js.haml +8 -0
- data/app/views/admin/fields/_field.html.haml +2 -2
- data/app/views/admin/fields/_form.html.haml +2 -2
- data/app/views/admin/fields/create.js.haml +17 -0
- data/app/views/admin/fields/destroy.js.haml +8 -0
- data/app/views/admin/fields/edit.js.haml +3 -0
- data/app/views/admin/fields/update.js.haml +13 -0
- data/app/views/admin/groups/_edit.html.haml +1 -1
- data/app/views/admin/groups/_new.html.haml +1 -1
- data/app/views/admin/groups/create.js.haml +10 -0
- data/app/views/admin/groups/destroy.js.haml +9 -0
- data/app/views/admin/groups/edit.js.haml +14 -0
- data/app/views/admin/groups/index.html.haml +1 -1
- data/app/views/admin/groups/index.js.haml +2 -0
- data/app/views/admin/groups/new.js.haml +9 -0
- data/app/views/admin/groups/update.js.haml +9 -0
- data/app/views/admin/tags/_edit.html.haml +1 -1
- data/app/views/admin/tags/_new.html.haml +1 -1
- data/app/views/admin/tags/confirm.js.haml +7 -0
- data/app/views/admin/tags/create.js.haml +11 -0
- data/app/views/admin/tags/destroy.js.haml +10 -0
- data/app/views/admin/tags/edit.js.haml +20 -0
- data/app/views/admin/tags/new.js.haml +7 -0
- data/app/views/admin/tags/update.js.haml +9 -0
- data/app/views/admin/users/_edit.html.haml +1 -1
- data/app/views/admin/users/_new.html.haml +1 -1
- data/app/views/admin/users/_user.html.haml +1 -1
- data/app/views/admin/users/confirm.js.haml +7 -0
- data/app/views/admin/users/create.js.haml +10 -0
- data/app/views/admin/users/destroy.js.haml +10 -0
- data/app/views/admin/users/edit.js.haml +20 -0
- data/app/views/admin/users/index.js.haml +2 -0
- data/app/views/admin/users/new.js.haml +9 -0
- data/app/views/admin/users/reactivate.js.haml +3 -0
- data/app/views/admin/users/suspend.js.haml +3 -0
- data/app/views/admin/users/update.js.haml +9 -0
- data/app/views/authentications/new.html.haml +1 -1
- data/app/views/campaigns/_edit.html.haml +1 -1
- data/app/views/campaigns/_new.html.haml +1 -1
- data/app/views/campaigns/create.js.haml +20 -0
- data/app/views/campaigns/destroy.js.haml +6 -0
- data/app/views/campaigns/edit.js.haml +33 -0
- data/app/views/campaigns/index.js.haml +11 -0
- data/app/views/campaigns/index.xls.builder +9 -7
- data/app/views/campaigns/new.js.haml +11 -0
- data/app/views/campaigns/show.js.haml +5 -0
- data/app/views/campaigns/update.js.haml +20 -0
- data/app/views/comments/_comment.html.haml +1 -1
- data/app/views/comments/_edit.html.haml +1 -1
- data/app/views/comments/_new.html.haml +3 -2
- data/app/views/comments/create.js.haml +14 -0
- data/app/views/comments/destroy.js.haml +5 -0
- data/app/views/comments/edit.js.haml +11 -0
- data/app/views/comments/update.js.haml +9 -0
- data/app/views/contacts/_edit.html.haml +1 -1
- data/app/views/contacts/_index_full.html.haml +1 -1
- data/app/views/contacts/_index_long.html.haml +2 -1
- data/app/views/contacts/_new.html.haml +1 -1
- data/app/views/contacts/_section_general.html.haml +3 -3
- data/app/views/contacts/create.js.haml +23 -0
- data/app/views/contacts/destroy.js.haml +9 -0
- data/app/views/contacts/edit.js.haml +35 -0
- data/app/views/contacts/index.js.haml +11 -0
- data/app/views/contacts/index.xls.builder +9 -7
- data/app/views/contacts/new.js.haml +13 -0
- data/app/views/contacts/show.js.haml +5 -0
- data/app/views/contacts/update.js.haml +22 -0
- data/app/views/emails/destroy.js.haml +5 -0
- data/app/views/entities/_permissions.html.haml +1 -1
- data/app/views/entities/attach.js.haml +21 -0
- data/app/views/entities/contacts.js.haml +3 -0
- data/app/views/entities/discard.js.haml +6 -0
- data/app/views/entities/leads.js.haml +3 -0
- data/app/views/entities/opportunities.js.haml +3 -0
- data/app/views/entities/subscription_update.js.haml +4 -0
- data/app/views/entities/versions.js.haml +3 -0
- data/app/views/fields/group.js.erb +3 -0
- data/app/views/home/_account.html.haml +3 -3
- data/app/views/home/_opportunity.html.haml +3 -3
- data/app/views/home/index.atom.builder +3 -3
- data/app/views/home/index.js.haml +7 -0
- data/app/views/home/index.rss.builder +2 -2
- data/app/views/home/options.js.haml +7 -0
- data/app/views/layouts/_footer.html.haml +0 -4
- data/app/views/layouts/_sidebar.html.haml +1 -0
- data/app/views/layouts/_tabbed.html.haml +1 -4
- data/app/views/layouts/admin/application.html.haml +0 -1
- data/app/views/layouts/application.html.haml +5 -7
- data/app/views/leads/_convert.html.haml +1 -1
- data/app/views/leads/_edit.html.haml +1 -1
- data/app/views/leads/_index_long.html.haml +2 -2
- data/app/views/leads/_new.html.haml +1 -1
- data/app/views/leads/convert.js.haml +35 -0
- data/app/views/leads/create.js.haml +21 -0
- data/app/views/leads/destroy.js.haml +9 -0
- data/app/views/leads/edit.js.haml +35 -0
- data/app/views/leads/index.js.haml +11 -0
- data/app/views/leads/index.xls.builder +9 -7
- data/app/views/leads/new.js.haml +11 -0
- data/app/views/leads/promote.js.haml +26 -0
- data/app/views/leads/reject.js.haml +12 -0
- data/app/views/leads/show.js.haml +5 -0
- data/app/views/leads/update.js.haml +26 -0
- data/app/views/lists/_personal_sidebar.html.haml +28 -0
- data/app/views/lists/_sidebar.html.haml +10 -7
- data/app/views/lists/create.js.haml +10 -0
- data/app/views/lists/destroy.js.haml +1 -0
- data/app/views/opportunities/_edit.html.haml +1 -1
- data/app/views/opportunities/_index_brief.html.haml +3 -3
- data/app/views/opportunities/_index_long.html.haml +3 -3
- data/app/views/opportunities/_new.html.haml +1 -2
- data/app/views/opportunities/_top_section.html.haml +4 -0
- data/app/views/opportunities/contacts.js.haml +3 -0
- data/app/views/opportunities/create.js.haml +29 -0
- data/app/views/opportunities/destroy.js.haml +13 -0
- data/app/views/opportunities/edit.js.haml +35 -0
- data/app/views/opportunities/index.js.haml +11 -0
- data/app/views/opportunities/index.xls.builder +9 -7
- data/app/views/opportunities/new.js.haml +13 -0
- data/app/views/opportunities/show.js.haml +5 -0
- data/app/views/opportunities/update.js.haml +25 -0
- data/app/views/passwords/edit.html.haml +1 -1
- data/app/views/passwords/new.html.haml +1 -1
- data/app/views/shared/_comment.html.haml +1 -1
- data/app/views/shared/_inline_styles.html.haml +1 -1
- data/app/views/tasks/_edit.html.haml +1 -1
- data/app/views/tasks/_new.html.haml +1 -1
- data/app/views/tasks/complete.js.haml +14 -0
- data/app/views/tasks/create.js.haml +39 -0
- data/app/views/tasks/destroy.js.haml +7 -0
- data/app/views/tasks/discard.js.haml +1 -0
- data/app/views/tasks/edit.js.haml +26 -0
- data/app/views/tasks/filter.js.haml +4 -0
- data/app/views/tasks/index.xls.builder +7 -5
- data/app/views/tasks/new.js.haml +8 -0
- data/app/views/tasks/update.js.haml +19 -0
- data/app/views/users/_password.html.haml +1 -1
- data/app/views/users/_profile.html.haml +1 -1
- data/app/views/users/avatar.js.haml +9 -0
- data/app/views/users/change_password.js.haml +13 -0
- data/app/views/users/edit.js.haml +9 -0
- data/app/views/users/new.html.haml +1 -1
- data/app/views/users/password.js.haml +10 -0
- data/app/views/users/update.js.haml +9 -0
- data/app/views/users/upload_avatar.js.haml +7 -0
- data/app/views/versions/_version.html.haml +1 -1
- data/config/application.rb +1 -4
- data/config/environments/production.rb +3 -2
- data/config/initializers/custom_field_ransack_translations.rb +15 -0
- data/config/initializers/locale.rb +9 -1
- data/config/initializers/secret_token.rb +1 -25
- data/config/initializers/views.rb +20 -20
- data/config/locales/cz.yml +245 -211
- data/config/locales/cz_fat_free_crm.yml +105 -181
- data/config/locales/de.yml +162 -118
- data/config/locales/de_fat_free_crm.yml +760 -731
- data/config/locales/de_ransack.yml +91 -0
- data/config/locales/en-GB.yml +158 -119
- data/config/locales/en-GB_fat_free_crm.yml +161 -279
- data/config/locales/en-US.yml +158 -121
- data/config/locales/en-US_fat_free_crm.yml +185 -179
- data/config/locales/en-US_ransack.yml +81 -82
- data/config/locales/es.yml +164 -123
- data/config/locales/es_fat_free_crm.yml +151 -209
- data/config/locales/fr-CA.yml +167 -130
- data/config/locales/fr-CA_fat_free_crm.yml +142 -202
- data/config/locales/fr.yml +170 -125
- data/config/locales/fr_fat_free_crm.yml +199 -302
- data/config/locales/it.yml +158 -122
- data/config/locales/it_fat_free_crm.yml +105 -168
- data/config/locales/ja.yml +162 -131
- data/config/locales/ja_fat_free_crm.yml +118 -188
- data/config/locales/pl.yml +168 -132
- data/config/locales/pl_fat_free_crm.yml +115 -186
- data/config/locales/pt-BR.yml +160 -127
- data/config/locales/pt-BR_fat_free_crm.yml +125 -182
- data/config/locales/ru.yml +256 -233
- data/config/locales/ru_fat_free_crm.yml +136 -193
- data/config/locales/sv-SE.yml +164 -181
- data/config/locales/sv-SE_fat_free_crm.yml +129 -193
- data/config/locales/th_fat_free_crm.yml +114 -194
- data/config/locales/zh-CN.yml +176 -149
- data/config/locales/zh-CN_fat_free_crm.yml +78 -167
- data/config/routes.rb +1 -1
- data/config/settings.default.yml +74 -23
- data/custom_plan.rb +11 -0
- data/db/migrate/20131207033244_add_user_id_to_lists.rb +6 -0
- data/db/schema.rb +4 -1
- data/fat_free_crm.gemspec +3 -3
- data/lib/fat_free_crm.rb +1 -11
- data/lib/fat_free_crm/export_csv.rb +3 -3
- data/lib/fat_free_crm/fields.rb +10 -0
- data/lib/fat_free_crm/gem_dependencies.rb +1 -2
- data/lib/fat_free_crm/i18n.rb +9 -5
- data/lib/fat_free_crm/version.rb +2 -2
- data/lib/fat_free_crm/view_factory.rb +8 -5
- data/lib/tasks/ffcrm/config.rake +9 -12
- data/lib/tasks/ffcrm/missing_translations.rake +2 -1
- data/spec/controllers/admin/users_controller_spec.rb +6 -4
- data/spec/controllers/applications_controller_spec.rb +4 -4
- data/spec/controllers/authentications_controller_spec.rb +15 -15
- data/spec/controllers/comments_controller_spec.rb +9 -87
- data/spec/controllers/emails_controller_spec.rb +1 -1
- data/spec/controllers/entities/accounts_controller_spec.rb +7 -7
- data/spec/controllers/entities/campaigns_controller_spec.rb +5 -5
- data/spec/controllers/entities/contacts_controller_spec.rb +7 -7
- data/spec/controllers/entities/leads_controller_spec.rb +14 -14
- data/spec/controllers/entities/opportunities_controller_spec.rb +8 -8
- data/spec/controllers/home_controller_spec.rb +6 -6
- data/spec/controllers/tasks_controller_spec.rb +7 -7
- data/spec/controllers/users_controller_spec.rb +22 -50
- data/spec/features/support/selector_helpers.rb +1 -6
- data/spec/features/tasks_spec.rb +2 -2
- data/spec/helpers/application_helper_spec.rb +15 -15
- data/spec/lib/fields_spec.rb +29 -29
- data/spec/lib/mail_processor/base_spec.rb +7 -7
- data/spec/lib/mail_processor/dropbox_spec.rb +3 -3
- data/spec/lib/view_factory_spec.rb +14 -14
- data/spec/models/entities/opportunity_spec.rb +1 -1
- data/spec/models/fields/custom_field_date_pair_spec.rb +14 -14
- data/spec/models/fields/custom_field_pair_spec.rb +13 -13
- data/spec/models/fields/custom_field_spec.rb +5 -5
- data/spec/models/fields/field_spec.rb +2 -2
- data/spec/models/observers/entity_observer_spec.rb +2 -2
- data/spec/models/users/user_spec.rb +7 -7
- data/spec/routing/comments_routing_spec.rb +0 -9
- data/spec/shared/controllers.rb +75 -77
- data/spec/shared/models.rb +1 -1
- data/spec/spec_helper.rb +1 -2
- data/spec/support/auth_macros.rb +3 -3
- data/spec/support/mail_processor_mocks.rb +13 -13
- data/spec/views/accounts/_edit.haml_spec.rb +1 -1
- data/spec/views/accounts/{create.rjs_spec.rb → create.js.haml_spec.rb} +9 -14
- data/spec/views/accounts/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -8
- data/spec/views/accounts/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +10 -18
- data/spec/views/accounts/{index.rjs_spec.rb → index.js.haml_spec.rb} +7 -11
- data/spec/views/accounts/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
- data/spec/views/accounts/show.haml_spec.rb +1 -1
- data/spec/views/accounts/{update.rjs_spec.rb → update.js.haml_spec.rb} +16 -25
- data/spec/views/admin/field_groups/create.js.haml_spec.rb +31 -0
- data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +31 -0
- data/spec/views/admin/field_groups/edit.js.haml_spec.rb +24 -0
- data/spec/views/admin/field_groups/new.js.haml_spec.rb +25 -0
- data/spec/views/admin/field_groups/update.js.haml_spec.rb +30 -0
- data/spec/views/admin/users/_create.haml_spec.rb +1 -1
- data/spec/views/admin/users/{create.rjs_spec.rb → create.js.haml_spec.rb} +6 -9
- data/spec/views/admin/users/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -7
- data/spec/views/admin/users/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +6 -12
- data/spec/views/admin/users/index.haml_spec.rb +0 -0
- data/spec/views/admin/users/{index.rjs_spec.rb → index.js.haml_spec.rb} +3 -5
- data/spec/views/admin/users/{new.rjs_spec.rb → new.js.haml_spec.rb} +4 -6
- data/spec/views/admin/users/{reactivate.rjs_spec.rb → reactivate.js.haml_spec.rb} +2 -4
- data/spec/views/admin/users/show.haml_spec.rb +0 -0
- data/spec/views/admin/users/{suspend.rjs_spec.rb → suspend.js.haml_spec.rb} +2 -4
- data/spec/views/admin/users/{update.rjs_spec.rb → update.js.haml_spec.rb} +6 -10
- data/spec/views/campaigns/{create.rjs_spec.rb → create.js.haml_spec.rb} +9 -14
- data/spec/views/campaigns/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -7
- data/spec/views/campaigns/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +11 -19
- data/spec/views/campaigns/{index.rjs_spec.rb → index.js.haml_spec.rb} +5 -9
- data/spec/views/campaigns/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
- data/spec/views/campaigns/{update.rjs_spec.rb → update.js.haml_spec.rb} +14 -21
- data/spec/views/comments/{new.rjs_spec.rb → edit.js.haml_spec.rb} +12 -9
- data/spec/views/contacts/{create.rjs_spec.rb → create.js.haml_spec.rb} +9 -16
- data/spec/views/contacts/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -8
- data/spec/views/contacts/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +12 -19
- data/spec/views/contacts/index.haml_spec.rb +1 -1
- data/spec/views/contacts/{index.rjs_spec.rb → index.js.html_spec.rb} +7 -11
- data/spec/views/contacts/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -7
- data/spec/views/contacts/{update.rjs_spec.rb → update.js.haml_spec.rb} +20 -35
- data/spec/views/home/{index.rjs_spec.rb → index.js.haml_spec.rb} +2 -4
- data/spec/views/home/{options.rjs_spec.rb → options.js.haml_spec.rb} +7 -12
- data/spec/views/leads/{convert.rjs_spec.rb → convert.js.haml_spec.rb} +12 -20
- data/spec/views/leads/{create.rjs_spec.rb → create.js.haml_spec.rb} +13 -19
- data/spec/views/leads/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +9 -12
- data/spec/views/leads/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +12 -20
- data/spec/views/leads/{index.rjs_spec.rb → index.js.haml_spec.rb} +5 -9
- data/spec/views/leads/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
- data/spec/views/leads/{promote.rjs_spec.rb → promote.js.haml_spec.rb} +28 -43
- data/spec/views/leads/{reject.rjs_spec.rb → reject.js.haml_spec.rb} +10 -17
- data/spec/views/leads/{update.rjs_spec.rb → update.js.haml_spec.rb} +25 -38
- data/spec/views/opportunities/{create.rjs_spec.rb → create.js.haml_spec.rb} +16 -26
- data/spec/views/opportunities/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +13 -16
- data/spec/views/opportunities/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +10 -18
- data/spec/views/opportunities/{index.rjs_spec.rb → index.js.haml_spec.rb} +7 -12
- data/spec/views/opportunities/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
- data/spec/views/opportunities/{update.rjs_spec.rb → update.js.haml_spec.rb} +29 -46
- data/spec/views/tasks/_edit.haml_spec.rb +1 -1
- data/spec/views/tasks/{complete.rjs_spec.rb → complete.js.haml_spec.rb} +9 -14
- data/spec/views/tasks/{create.rjs_spec.rb → create.js.haml_spec.rb} +25 -33
- data/spec/views/tasks/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +9 -11
- data/spec/views/tasks/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +9 -14
- data/spec/views/tasks/index.haml_spec.rb +1 -2
- data/spec/views/tasks/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
- data/spec/views/tasks/{update.rjs_spec.rb → update.js.haml_spec.rb} +28 -41
- data/spec/views/users/{avatar.rjs_spec.rb → avatar.js.haml_spec.rb} +7 -9
- data/spec/views/users/{change_password.rjs_spec.rb → change_password.js.haml_spec.rb} +10 -12
- data/spec/views/users/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +8 -10
- data/spec/views/users/{password.rjs_spec.rb → password.js.haml_spec.rb} +9 -11
- data/spec/views/users/{update.rjs_spec.rb → update.js.haml_spec.rb} +7 -15
- data/spec/views/users/{upload_avatar.rjs_spec.rb → upload_avatar.js.haml_spec.rb} +8 -10
- data/vendor/assets/javascripts/ajax-chosen-jquery.js +2 -0
- data/vendor/assets/javascripts/ajax-chosen-prototype.js +2 -0
- data/vendor/assets/javascripts/ajax-chosen.jquery.coffee +81 -0
- data/vendor/assets/javascripts/ajax-chosen.proto.coffee +98 -0
- data/vendor/assets/javascripts/jquery_timeago/index.js +17 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.cz.js +18 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.de.js +18 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.en-GB.js +20 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.en-US.js +20 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.es.js +18 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.fr-CA.js +17 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.fr.js +17 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.it.js +16 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.ja.js +19 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.js +194 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.pl.js +31 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.pt-BR.js +18 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.ru.js +34 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.sv-SE.js +18 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.th.js +20 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.zh-CN.js +20 -0
- data/zeus.json +2 -1
- metadata +240 -245
- data/app/assets/images/delete.png +0 -0
- data/app/assets/images/iconset_attribution.png +0 -0
- data/app/views/accounts/create.js.rjs +0 -14
- data/app/views/accounts/destroy.js.rjs +0 -3
- data/app/views/accounts/edit.js.rjs +0 -33
- data/app/views/accounts/index.js.rjs +0 -8
- data/app/views/accounts/new.js.rjs +0 -9
- data/app/views/accounts/show.js.erb +0 -2
- data/app/views/accounts/update.js.rjs +0 -17
- data/app/views/admin/field_groups/confirm.js.rjs +0 -6
- data/app/views/admin/field_groups/create.js.rjs +0 -20
- data/app/views/admin/field_groups/destroy.js.rjs +0 -11
- data/app/views/admin/field_groups/edit.js.rjs +0 -14
- data/app/views/admin/field_groups/new.js.rjs +0 -9
- data/app/views/admin/field_groups/update.js.rjs +0 -9
- data/app/views/admin/fields/create.js.erb +0 -19
- data/app/views/admin/fields/destroy.js.erb +0 -9
- data/app/views/admin/fields/edit.js.erb +0 -1
- data/app/views/admin/fields/update.js.erb +0 -13
- data/app/views/admin/groups/create.js.rjs +0 -11
- data/app/views/admin/groups/destroy.js.rjs +0 -11
- data/app/views/admin/groups/edit.js.rjs +0 -21
- data/app/views/admin/groups/index.js.rjs +0 -2
- data/app/views/admin/groups/new.js.rjs +0 -9
- data/app/views/admin/groups/update.js.rjs +0 -10
- data/app/views/admin/tags/confirm.js.rjs +0 -6
- data/app/views/admin/tags/create.js.rjs +0 -12
- data/app/views/admin/tags/destroy.js.rjs +0 -11
- data/app/views/admin/tags/edit.js.rjs +0 -21
- data/app/views/admin/tags/new.js.rjs +0 -8
- data/app/views/admin/tags/update.js.rjs +0 -10
- data/app/views/admin/users/confirm.js.rjs +0 -6
- data/app/views/admin/users/create.js.rjs +0 -11
- data/app/views/admin/users/destroy.js.rjs +0 -11
- data/app/views/admin/users/edit.js.rjs +0 -21
- data/app/views/admin/users/index.js.rjs +0 -3
- data/app/views/admin/users/new.js.rjs +0 -8
- data/app/views/admin/users/reactivate.js.rjs +0 -3
- data/app/views/admin/users/suspend.js.rjs +0 -3
- data/app/views/admin/users/update.js.rjs +0 -10
- data/app/views/campaigns/create.js.rjs +0 -18
- data/app/views/campaigns/destroy.js.rjs +0 -3
- data/app/views/campaigns/edit.js.rjs +0 -34
- data/app/views/campaigns/index.js.rjs +0 -8
- data/app/views/campaigns/new.js.rjs +0 -9
- data/app/views/campaigns/show.js.erb +0 -2
- data/app/views/campaigns/update.js.rjs +0 -21
- data/app/views/comments/create.js.rjs +0 -11
- data/app/views/comments/destroy.js.rjs +0 -6
- data/app/views/comments/edit.js.rjs +0 -11
- data/app/views/comments/new.js.rjs +0 -14
- data/app/views/comments/update.js.rjs +0 -11
- data/app/views/contacts/create.js.rjs +0 -19
- data/app/views/contacts/destroy.js.rjs +0 -7
- data/app/views/contacts/edit.js.rjs +0 -36
- data/app/views/contacts/index.js.rjs +0 -8
- data/app/views/contacts/new.js.rjs +0 -11
- data/app/views/contacts/show.js.erb +0 -2
- data/app/views/contacts/update.js.rjs +0 -22
- data/app/views/emails/destroy.js.rjs +0 -6
- data/app/views/entities/attach.js.rjs +0 -24
- data/app/views/entities/contacts.js.rjs +0 -3
- data/app/views/entities/discard.js.rjs +0 -7
- data/app/views/entities/leads.js.rjs +0 -3
- data/app/views/entities/opportunities.js.rjs +0 -3
- data/app/views/entities/subscription_update.js.rjs +0 -4
- data/app/views/entities/versions.js.erb +0 -3
- data/app/views/fields/group.js.rjs +0 -7
- data/app/views/home/index.js.rjs +0 -7
- data/app/views/home/options.js.rjs +0 -8
- data/app/views/leads/convert.js.rjs +0 -37
- data/app/views/leads/create.js.rjs +0 -19
- data/app/views/leads/destroy.js.rjs +0 -7
- data/app/views/leads/edit.js.rjs +0 -36
- data/app/views/leads/index.js.rjs +0 -8
- data/app/views/leads/new.js.rjs +0 -9
- data/app/views/leads/promote.js.rjs +0 -27
- data/app/views/leads/reject.js.rjs +0 -10
- data/app/views/leads/show.js.erb +0 -2
- data/app/views/leads/update.js.rjs +0 -27
- data/app/views/lists/create.js.rjs +0 -9
- data/app/views/lists/destroy.js.rjs +0 -1
- data/app/views/opportunities/contacts.js.rjs +0 -3
- data/app/views/opportunities/create.js.rjs +0 -29
- data/app/views/opportunities/destroy.js.rjs +0 -11
- data/app/views/opportunities/edit.js.rjs +0 -36
- data/app/views/opportunities/index.js.rjs +0 -8
- data/app/views/opportunities/new.js.rjs +0 -12
- data/app/views/opportunities/show.js.erb +0 -2
- data/app/views/opportunities/update.js.rjs +0 -26
- data/app/views/tasks/complete.js.rjs +0 -17
- data/app/views/tasks/create.js.rjs +0 -41
- data/app/views/tasks/destroy.js.rjs +0 -7
- data/app/views/tasks/discard.rjs +0 -1
- data/app/views/tasks/edit.js.rjs +0 -23
- data/app/views/tasks/filter.js.rjs +0 -1
- data/app/views/tasks/new.js.rjs +0 -9
- data/app/views/tasks/update.js.rjs +0 -21
- data/app/views/users/avatar.js.rjs +0 -10
- data/app/views/users/change_password.js.rjs +0 -15
- data/app/views/users/edit.js.rjs +0 -10
- data/app/views/users/password.js.rjs +0 -11
- data/app/views/users/update.js.rjs +0 -10
- data/app/views/users/upload_avatar.js.rjs +0 -8
- data/lib/fat_free_crm/secret_token_generator.rb +0 -65
- data/spec/lib/secret_token_generator_spec.rb +0 -79
- data/spec/models/users/abilities/user_ability_spec.rb +0 -58
- data/spec/support/rjs_support.rb +0 -14
- data/vendor/assets/images/brief.png +0 -0
- data/vendor/assets/images/full.png +0 -0
- data/vendor/assets/images/long.png +0 -0
- data/vendor/assets/images/tab_icons/accounts.png +0 -0
- data/vendor/assets/images/tab_icons/accounts_active.png +0 -0
- data/vendor/assets/images/tab_icons/campaigns.png +0 -0
- data/vendor/assets/images/tab_icons/campaigns_active.png +0 -0
- data/vendor/assets/images/tab_icons/contacts.png +0 -0
- data/vendor/assets/images/tab_icons/contacts_active.png +0 -0
- data/vendor/assets/images/tab_icons/dashboard.png +0 -0
- data/vendor/assets/images/tab_icons/dashboard_active.png +0 -0
- data/vendor/assets/images/tab_icons/leads.png +0 -0
- data/vendor/assets/images/tab_icons/leads_active.png +0 -0
- data/vendor/assets/images/tab_icons/opportunities.png +0 -0
- data/vendor/assets/images/tab_icons/opportunities_active.png +0 -0
- data/vendor/assets/images/tab_icons/tasks.png +0 -0
- data/vendor/assets/images/tab_icons/tasks_active.png +0 -0
@@ -0,0 +1,13 @@
|
|
1
|
+
- entity_name = controller.controller_name.singularize
|
2
|
+
- create_id = "create_#{entity_name}"
|
3
|
+
|
4
|
+
crm.flick('empty', 'toggle');
|
5
|
+
crm.flip_form('#{create_id}');
|
6
|
+
|
7
|
+
- unless params[:cancel].true?
|
8
|
+
jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
|
9
|
+
crm.set_title('#{create_id}', '#{ j t(create_id) }');
|
10
|
+
-# this function call is the only difference to normal new.js.haml
|
11
|
+
crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
|
12
|
+
- else
|
13
|
+
crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');
|
@@ -0,0 +1,5 @@
|
|
1
|
+
- entity_name = controller.controller_name.singularize.underscore #account
|
2
|
+
- @entity = instance_variable_get("@#{entity_name}")
|
3
|
+
|
4
|
+
jQuery('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
|
5
|
+
= raw generate_js_for_popups(@entity, :tasks, :contacts)
|
@@ -0,0 +1,25 @@
|
|
1
|
+
- entity_name = controller.controller_name.singularize.underscore #account
|
2
|
+
- @entity = instance_variable_get("@#{entity_name}")
|
3
|
+
- id = called_from_landing_page? ? "edit_#{entity_name}" : dom_id(@entity)
|
4
|
+
|
5
|
+
- if @entity.errors.empty?
|
6
|
+
- if called_from_landing_page?
|
7
|
+
crm.flip_form('edit_#{entity_name}');
|
8
|
+
crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
|
9
|
+
= refresh_sidebar(:show, :summary)
|
10
|
+
- else
|
11
|
+
jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
|
12
|
+
jQuery('##{id}').effect("highlight", { duration:1500 });
|
13
|
+
- if called_from_index_page?
|
14
|
+
= refresh_sidebar(:index, :filters)
|
15
|
+
- elsif called_from_landing_page?(:accounts)
|
16
|
+
= refresh_sidebar_for(:accounts, :show, :summary)
|
17
|
+
- elsif called_from_landing_page?(:campaigns)
|
18
|
+
= refresh_sidebar_for(:campaigns, :show, :summary)
|
19
|
+
- else
|
20
|
+
jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
|
21
|
+
- else
|
22
|
+
jQuery('##{id}').html('#{ j render(:partial => "edit") }');
|
23
|
+
crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
|
24
|
+
jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
|
25
|
+
jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
|
@@ -1,5 +1,5 @@
|
|
1
1
|
.standalone
|
2
|
-
= form_for(@user, :url => password_path(params[:id]), :html => one_submit_only
|
2
|
+
= form_for(@user, :url => password_path(params[:id]), :html => one_submit_only, :method => :put) do |f|
|
3
3
|
.title #{t :reset_password}
|
4
4
|
|
5
5
|
= f.error_messages :object_name => t('password')
|
@@ -1,5 +1,5 @@
|
|
1
1
|
.remote
|
2
|
-
= simple_form_for(@task, :html => one_submit_only
|
2
|
+
= simple_form_for(@task, :html => one_submit_only, :remote => true) do |f|
|
3
3
|
= link_to_close edit_task_path(@task)
|
4
4
|
= hidden_field_tag :view, @view
|
5
5
|
= hidden_field_tag "task[asset_id]", "#{@asset.id if @asset}"
|
@@ -1,4 +1,4 @@
|
|
1
|
-
= simple_form_for(@task, :html => one_submit_only
|
1
|
+
= simple_form_for(@task, :html => one_submit_only, :remote => true) do |f|
|
2
2
|
= link_to_close new_task_path + "?view=#{@view}"
|
3
3
|
= hidden_field_tag :view, @view
|
4
4
|
= hidden_field_tag "task[user_id]", current_user.id
|
@@ -0,0 +1,14 @@
|
|
1
|
+
- if called_from_index_page? # Completing from pending tasks view -- fade out task partial and update sidebar.
|
2
|
+
|
3
|
+
jQuery('##{dom_id(@task, :tools)}').hide();
|
4
|
+
jQuery('##{dom_id(@task)}').fadeOut({ duration:500 });
|
5
|
+
- if @empty_bucket
|
6
|
+
jQuery('#list_#{@empty_bucket}').fadeOut({ duration:500 });
|
7
|
+
= refresh_sidebar(:index, :filters)
|
8
|
+
|
9
|
+
- else # Completing from the Asset page -- replace task partial with completed one.
|
10
|
+
|
11
|
+
jQuery('##{dom_id(@task)}').hide();
|
12
|
+
jQuery('##{dom_id(@task)}').html('#{ j render(:partial => "tasks/completed", :collection => [ @task ], :locals => { :bucket => nil }) }');
|
13
|
+
jQuery('##{dom_id(@task)}').fadeIn({ duration:500 });
|
14
|
+
jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
|
@@ -0,0 +1,39 @@
|
|
1
|
+
- if @task.valid?
|
2
|
+
jQuery('#create_task_arrow').html(crm.COLLAPSED);
|
3
|
+
jQuery('#create_task').slideUp(250);
|
4
|
+
|
5
|
+
- if called_from_index_page? # "Classic" [Create Task] form requested from the Tasks page.
|
6
|
+
jQuery('#title').html('#{ j (@view == "assigned" ? t(:assigned_tasks) : t(:tasks)) }');
|
7
|
+
|
8
|
+
-# Show flash if assigned to somebody else from the [Pending Tasks] page.
|
9
|
+
- if @view == "pending" && @task.assigned_to && @task.assigned_to != current_user.id
|
10
|
+
jQuery('#flash').html('#{j t(:task_created)} #{j t(:task_assigned_to, @task.assignee.full_name)} (#{j link_to(t(:view_assigned_tasks), url_for(:view => "assigned"))}).');
|
11
|
+
crm.flash('notice', true);
|
12
|
+
jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
|
13
|
+
|
14
|
+
- # Show flash if assigned to current user from the [Assigned Tasks] page.
|
15
|
+
- elsif @view == "assigned" && @task.assigned_to.blank?
|
16
|
+
jQuery('#flash').html('#{j t(:task_created)} (#{j link_to(t(:view_pending_tasks), tasks_url)}).');
|
17
|
+
crm.flash('notice', true);
|
18
|
+
jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
|
19
|
+
|
20
|
+
- else # Show newly created task by inserting its div into appropriate bucket; then update tasks sidebar.
|
21
|
+
- bucket = @task.computed_bucket
|
22
|
+
jQuery('#list_#{bucket}').show();
|
23
|
+
jQuery('##{bucket}').before('#{ j render(:partial => @view, :collection => [ @task ], :locals => { :bucket => bucket }) }');
|
24
|
+
jQuery('##{dom_id(@task)}').effect("highlight", { duration:1500 });
|
25
|
+
= refresh_sidebar(:index, :filters)
|
26
|
+
|
27
|
+
crm.flick('empty', 'remove');
|
28
|
+
|
29
|
+
- else # Inline [Create Task] form reqested from any of the core asset landing pages.
|
30
|
+
jQuery('#create_task_title').html('#{ j t(:tasks) }');
|
31
|
+
- partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
|
32
|
+
jQuery('#tasks').prepend('#{ j render(:partial => "tasks/#{partial}", :collection => [@task], :locals => { :bucket => nil }) }');
|
33
|
+
jQuery('##{dom_id(@task)}').effect("highlight", { duration:1500 });
|
34
|
+
jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
|
35
|
+
|
36
|
+
- else # Couldn't create the task -- validation failed.
|
37
|
+
jQuery('#create_task').effect("shake", { duration:250, distance: 6 });
|
38
|
+
jQuery('#task_name').focus();
|
39
|
+
jQuery('#new_task input[type=submit]').enable();
|
@@ -0,0 +1 @@
|
|
1
|
+
jQuery('##{dom_id(@task)}').slideUp(250);
|
@@ -0,0 +1,26 @@
|
|
1
|
+
- id = dom_id(@task)
|
2
|
+
|
3
|
+
- if params[:cancel].true? # <----------------- Hide [Edit Task]
|
4
|
+
|
5
|
+
- partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
|
6
|
+
jQuery('##{id}').html('#{ j render(:partial => partial, :collection => [ @task ], :locals => { :bucket => @task.bucket }) }');
|
7
|
+
|
8
|
+
- else # <---------------------------------------- Show [Edit Task] form.
|
9
|
+
|
10
|
+
-# Hide [Create Task] form if it's open.
|
11
|
+
crm.hide_form('create_task');
|
12
|
+
|
13
|
+
-# Hide open [Edit Lead] form if any.
|
14
|
+
- if @previous
|
15
|
+
- if @previous.is_a?(Task)
|
16
|
+
- partial = (@previous.assigned_to && @previous.assigned_to != current_user.id) ? "assigned" : "pending"
|
17
|
+
jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => partial, :collection => [ @previous ], :locals => { :bucket => nil }) }');
|
18
|
+
- else
|
19
|
+
crm.flick('task_#{@previous}', 'remove');
|
20
|
+
|
21
|
+
-# Disable onMouseOver for the list item.
|
22
|
+
crm.highlight_off('#{id}');
|
23
|
+
|
24
|
+
-# Show [Edit Task] form.
|
25
|
+
jQuery('##{id}').html('#{ j render(:partial => "edit") }');
|
26
|
+
jQuery('#task_name').focus();
|
@@ -3,7 +3,8 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_tasks) do
|
|
3
3
|
unless @tasks.empty?
|
4
4
|
# Header.
|
5
5
|
xml.Row do
|
6
|
-
heads = %w{
|
6
|
+
heads = %w{id
|
7
|
+
name
|
7
8
|
due
|
8
9
|
date_created
|
9
10
|
date_updated
|
@@ -12,7 +13,7 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_tasks) do
|
|
12
13
|
assigned_to
|
13
14
|
category
|
14
15
|
background_info}
|
15
|
-
|
16
|
+
|
16
17
|
heads.each do |head|
|
17
18
|
xml.Cell do
|
18
19
|
xml.Data I18n.t(head),
|
@@ -20,11 +21,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_tasks) do
|
|
20
21
|
end
|
21
22
|
end
|
22
23
|
end
|
23
|
-
|
24
|
+
|
24
25
|
# Rows.
|
25
26
|
@tasks.map(&:second).flatten.each do |task|
|
26
27
|
xml.Row do
|
27
|
-
data = [task.
|
28
|
+
data = [task.id,
|
29
|
+
task.name,
|
28
30
|
I18n.t(task.computed_bucket),
|
29
31
|
task.created_at,
|
30
32
|
task.updated_at,
|
@@ -33,7 +35,7 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_tasks) do
|
|
33
35
|
task.assignee.try(:name),
|
34
36
|
task.category,
|
35
37
|
task.background_info]
|
36
|
-
|
38
|
+
|
37
39
|
data.each do |value|
|
38
40
|
xml.Cell do
|
39
41
|
xml.Data value,
|
@@ -0,0 +1,8 @@
|
|
1
|
+
crm.flick('empty', 'toggle');
|
2
|
+
crm.flip_form('create_task');
|
3
|
+
|
4
|
+
- unless params[:cancel].true?
|
5
|
+
jQuery('#create_task').html('#{ j render(:partial => "new") }');
|
6
|
+
crm.set_title('create_task', '#{j t(:create_task) }');
|
7
|
+
- else
|
8
|
+
crm.set_title('create_task', '#{ @view == "assigned" ? t(:assigned_tasks) : t(:tasks) }');
|
@@ -0,0 +1,19 @@
|
|
1
|
+
- if @task.errors.empty?
|
2
|
+
|
3
|
+
- if !called_from_index_page?
|
4
|
+
-# If it's not Tasks tab then we just reload appropriate
|
5
|
+
-# partial with the new task, and update recent items.
|
6
|
+
= replace_content(@task)
|
7
|
+
jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
|
8
|
+
- else
|
9
|
+
- if @task.assigned_to != @task_before_update.assigned_to
|
10
|
+
= reassign(@task)
|
11
|
+
- elsif @task.bucket != @task_before_update.bucket
|
12
|
+
= reschedule(@task)
|
13
|
+
- else
|
14
|
+
= replace_content(@task, @task.bucket)
|
15
|
+
|
16
|
+
- else # Errors
|
17
|
+
jQuery('##{dom_id(@task)}').effect("shake", { duration:250, distance: 6 });
|
18
|
+
jQuery('#task_name').focus();
|
19
|
+
jQuery('#task_submit').enable();
|
@@ -1,5 +1,5 @@
|
|
1
1
|
.remote
|
2
|
-
= form_for(@user, :url => change_password_user_path(@user), :html => one_submit_only
|
2
|
+
= form_for(@user, :url => change_password_user_path(@user), :html => one_submit_only, :remote => true) do |f|
|
3
3
|
= link_to_close password_user_path(@user)
|
4
4
|
|
5
5
|
= f.error_messages :object_name => t('password')
|
@@ -0,0 +1,9 @@
|
|
1
|
+
- if params[:cancel].true?
|
2
|
+
crm.flip_form('upload_avatar');
|
3
|
+
crm.set_title('upload_avatar', '#{j t(:my_profile)}');
|
4
|
+
- else
|
5
|
+
jQuery('#upload_avatar').html('#{ j render(:partial => "avatar") }');
|
6
|
+
crm.hide_form('edit_profile');
|
7
|
+
crm.hide_form('change_password');
|
8
|
+
crm.flip_form('upload_avatar');
|
9
|
+
crm.set_title('upload_avatar', '#{j t(:upload_picture)}');
|
@@ -0,0 +1,13 @@
|
|
1
|
+
- if @user.errors.empty?
|
2
|
+
crm.flip_form('change_password');
|
3
|
+
crm.set_title('change_password', '#{ j t(:my_profile) }');
|
4
|
+
jQuery('#flash').html('#{ j flash[:notice] }');
|
5
|
+
crm.flash('notice')
|
6
|
+
- flash[:notice] = nil
|
7
|
+
- else
|
8
|
+
jQuery('#change_password').html('#{ j render(:partial => "password") }');
|
9
|
+
jQuery('#change_password').effect("shake", { duration:250, distance: 6 });
|
10
|
+
- if @user.errors[:current_password].present?
|
11
|
+
jQuery('#current_password').focus();
|
12
|
+
- else
|
13
|
+
jQuery('#user_password').focus();
|
@@ -0,0 +1,9 @@
|
|
1
|
+
- if params[:cancel].true?
|
2
|
+
crm.flip_form('edit_profile');
|
3
|
+
crm.set_title('edit_profile', '#{ j t(:my_profile) }');
|
4
|
+
- else
|
5
|
+
jQuery('#edit_profile').html('#{ j render(:partial => "profile") }');
|
6
|
+
crm.hide_form('upload_avatar');
|
7
|
+
crm.hide_form('change_password');
|
8
|
+
crm.flip_form('edit_profile');
|
9
|
+
crm.set_title('edit_profile', '#{t(:edit_profile)}');
|
@@ -0,0 +1,10 @@
|
|
1
|
+
- if params[:cancel].true?
|
2
|
+
crm.flip_form('change_password');
|
3
|
+
crm.set_title('change_password', '#{t(:my_profile)}');
|
4
|
+
- else
|
5
|
+
jQuery('#change_password').html('#{ j render(:partial => "password") }');
|
6
|
+
crm.hide_form('edit_profile');
|
7
|
+
crm.hide_form('upload_avatar');
|
8
|
+
crm.flip_form('change_password');
|
9
|
+
crm.set_title('change_password', '#{t(:change_password)}');
|
10
|
+
jQuery('#current_password').focus();
|
@@ -0,0 +1,9 @@
|
|
1
|
+
- if @user.errors.empty?
|
2
|
+
crm.flip_form('edit_profile');
|
3
|
+
crm.set_title('edit_profile', '#{j t(:my_profile)}');
|
4
|
+
jQuery('#welcome_username').html('#{j current_user.name}');
|
5
|
+
jQuery('#profile').html('#{ j render(:partial => "user") }');
|
6
|
+
- else
|
7
|
+
jQuery('#edit_profile').html('#{ j render(:partial => "profile") }');
|
8
|
+
jQuery('#edit_profile').effect("shake", { duration:250, distance: 6 });
|
9
|
+
jQuery('#user_email').focus();
|
@@ -0,0 +1,7 @@
|
|
1
|
+
- if @user.avatar.nil? || @user.avatar.errors.empty?
|
2
|
+
crm.flip_form('upload_avatar');
|
3
|
+
crm.set_title('upload_avatar', '#{j t(:my_profile)}');
|
4
|
+
jQuery('#profile').html('#{ j render(:partial => "user") }');
|
5
|
+
- else
|
6
|
+
jQuery('#upload_avatar').html('#{ j render(:partial => "avatar") }');
|
7
|
+
jQuery('#upload_avatar').effect("shake", { duration:250, distance: 6 });
|
@@ -10,7 +10,7 @@
|
|
10
10
|
= t('version.' + version.event, :item => item_type, :by => user_name, :default => version.event)
|
11
11
|
- else
|
12
12
|
= auto_link(version.event).html_safe
|
13
|
-
%small=
|
13
|
+
%small= timeago(version.created_at).html_safe
|
14
14
|
%tt
|
15
15
|
- version.changeset.each do |attr_name, change|
|
16
16
|
- label, first, second = parse_version(attr_name, change)
|
data/config/application.rb
CHANGED
@@ -6,9 +6,6 @@
|
|
6
6
|
require File.expand_path('../boot', __FILE__)
|
7
7
|
|
8
8
|
require 'rubygems'
|
9
|
-
require 'yaml'
|
10
|
-
YAML::ENGINE.yamler = 'syck'
|
11
|
-
|
12
9
|
require 'rails/all'
|
13
10
|
|
14
11
|
if defined?(Bundler)
|
@@ -65,7 +62,7 @@ module FatFreeCRM
|
|
65
62
|
config.encoding = "utf-8"
|
66
63
|
|
67
64
|
# Configure sensitive parameters which will be filtered from the log file.
|
68
|
-
config.filter_parameters += [:password
|
65
|
+
config.filter_parameters += [:password]
|
69
66
|
|
70
67
|
# Use SQL instead of Active Record's schema dumper when creating the database.
|
71
68
|
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
@@ -10,8 +10,9 @@ if defined?(FatFreeCRM::Application)
|
|
10
10
|
# Code is not reloaded between requests
|
11
11
|
config.cache_classes = true
|
12
12
|
|
13
|
-
# Full error reports are
|
14
|
-
config.consider_all_requests_local =
|
13
|
+
# Full error reports are enabled, since this is an internal application.
|
14
|
+
config.consider_all_requests_local = true
|
15
|
+
# Caching is turned on
|
15
16
|
config.action_controller.perform_caching = true
|
16
17
|
|
17
18
|
# Disable Rails's static asset server (Apache or nginx will already do this)
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# Load field names for custom fields, for Ransack search
|
2
|
+
if Setting.database_and_table_exists?
|
3
|
+
Rails.application.config.after_initialize do
|
4
|
+
I18n.backend.load_translations
|
5
|
+
|
6
|
+
translations = {ransack: { attributes: {}}}
|
7
|
+
CustomField.find_each do |custom_field|
|
8
|
+
model_key = custom_field.klass.model_name.singular
|
9
|
+
translations[:ransack][:attributes][model_key] ||= {}
|
10
|
+
translations[:ransack][:attributes][model_key][custom_field.name] = custom_field.label
|
11
|
+
end
|
12
|
+
|
13
|
+
I18n.backend.store_translations(Setting.locale.to_sym, translations)
|
14
|
+
end
|
15
|
+
end
|
@@ -3,6 +3,14 @@
|
|
3
3
|
# Fat Free CRM is freely distributable under the terms of MIT license.
|
4
4
|
# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
|
5
5
|
#------------------------------------------------------------------------------
|
6
|
+
|
6
7
|
# Set default locale from Settings
|
8
|
+
# defer setting the locale until all I18n locales have been initialized
|
9
|
+
#------------------------------------------------------------------------------
|
10
|
+
|
11
|
+
# Turn off until https://github.com/rails/rails/issues/13164 is fixed
|
12
|
+
I18n.config.enforce_available_locales = false
|
7
13
|
|
8
|
-
|
14
|
+
FatFreeCRM.application.config.after_initialize do
|
15
|
+
I18n.default_locale = Setting.locale
|
16
|
+
end
|
@@ -1,25 +1 @@
|
|
1
|
-
|
2
|
-
#
|
3
|
-
# Fat Free CRM is freely distributable under the terms of MIT license.
|
4
|
-
# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
|
5
|
-
#------------------------------------------------------------------------------
|
6
|
-
|
7
|
-
# Be sure to restart your server when you modify this file.
|
8
|
-
|
9
|
-
# Your secret key is used for verifying the integrity of signed cookies.
|
10
|
-
# If you change this key, all old signed cookies will become invalid!
|
11
|
-
|
12
|
-
# Make sure the secret is at least 30 characters and all random,
|
13
|
-
# no regular words or you'll be exposed to dictionary attacks.
|
14
|
-
# You can use `rake secret` to generate a secure secret key.
|
15
|
-
|
16
|
-
# Make sure your secret_key_base is kept private
|
17
|
-
# if you're sharing your code publicly.
|
18
|
-
|
19
|
-
#
|
20
|
-
# We should setup a secret token if FFCRM is running in application mode but NOT in engine mode.
|
21
|
-
# This functionality has been extracted to lib so it can be tested.
|
22
|
-
if FatFreeCRM.application?
|
23
|
-
require 'fat_free_crm/secret_token_generator'
|
24
|
-
FatFreeCRM::SecretTokenGenerator.setup!
|
25
|
-
end
|
1
|
+
FatFreeCRM::Application.config.secret_token = 'be17625f6b1d92df0ed33a3ea57905ed321ef6089c213f23b2dff44a9b236d836b854451068ae030741b182d29ac25c5dbd075c993cabfd624d825e66e073071'
|