fat_free_crm 0.17.3 → 0.19.2
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 +4 -4
- data/.rubocop.yml +1 -1
- data/.rubocop_todo.yml +71 -148
- data/.travis.yml +35 -14
- data/CHANGELOG.md +92 -6
- data/CONTRIBUTORS.md +96 -53
- data/Dockerfile +45 -14
- data/Gemfile +23 -13
- data/Gemfile.lock +256 -248
- data/Procfile +1 -1
- data/README.md +9 -6
- data/Rakefile +1 -1
- data/app/assets/javascripts/crm.js.coffee +3 -3
- data/app/assets/javascripts/crm_select2.js.coffee +15 -14
- data/app/assets/stylesheets/common.scss +1 -1
- data/app/controllers/admin/application_controller.rb +1 -1
- data/app/controllers/admin/field_groups_controller.rb +9 -4
- data/app/controllers/admin/fields_controller.rb +4 -4
- data/app/controllers/admin/groups_controller.rb +1 -1
- data/app/controllers/admin/tags_controller.rb +2 -4
- data/app/controllers/admin/users_controller.rb +5 -8
- data/app/controllers/application_controller.rb +22 -45
- data/app/controllers/comments_controller.rb +16 -11
- data/{config/initializers/authlogic.rb → app/controllers/confirmations_controller.rb} +4 -2
- data/app/controllers/emails_controller.rb +0 -2
- data/app/controllers/entities/accounts_controller.rb +1 -3
- data/app/controllers/entities/campaigns_controller.rb +8 -5
- data/app/controllers/entities/contacts_controller.rb +4 -24
- data/app/controllers/entities/leads_controller.rb +16 -12
- data/app/controllers/entities/opportunities_controller.rb +17 -16
- data/app/controllers/entities_controller.rb +31 -12
- data/app/controllers/home_controller.rb +2 -4
- data/app/controllers/lists_controller.rb +5 -1
- data/app/controllers/passwords_controller.rb +3 -59
- data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb} +12 -5
- data/{lib/development_tasks/gem.rake → app/controllers/sessions_controller.rb} +6 -6
- data/app/controllers/tasks_controller.rb +22 -17
- data/app/controllers/users_controller.rb +8 -29
- data/app/helpers/accounts_helper.rb +1 -1
- data/app/helpers/admin/users_helper.rb +1 -1
- data/app/helpers/application_helper.rb +28 -33
- data/app/helpers/campaigns_helper.rb +1 -1
- data/app/helpers/contacts_helper.rb +1 -3
- data/app/helpers/leads_helper.rb +1 -1
- data/app/helpers/opportunities_helper.rb +48 -3
- data/app/helpers/tasks_helper.rb +1 -1
- data/app/helpers/users_helper.rb +1 -3
- data/{config/initializers/paper_trail.rb → app/mailers/devise_mailer.rb} +5 -1
- data/app/mailers/user_mailer.rb +0 -9
- data/app/models/entities/account.rb +10 -10
- data/app/models/entities/campaign.rb +4 -6
- data/app/models/entities/contact.rb +24 -12
- data/app/models/entities/lead.rb +7 -14
- data/app/models/entities/opportunity.rb +10 -11
- data/app/models/fields/custom_field.rb +1 -0
- data/app/models/fields/custom_field_date_pair.rb +2 -0
- data/app/models/fields/field.rb +1 -3
- data/app/models/list.rb +1 -1
- data/app/models/observers/entity_observer.rb +3 -7
- data/app/models/observers/lead_observer.rb +2 -4
- data/app/models/observers/opportunity_observer.rb +5 -7
- data/app/models/observers/task_observer.rb +1 -1
- data/app/models/polymorphic/email.rb +2 -2
- data/app/models/polymorphic/task.rb +13 -9
- data/app/models/polymorphic/version.rb +3 -2
- data/app/models/setting.rb +2 -0
- data/app/models/users/ability.rb +3 -4
- data/app/models/users/permission.rb +3 -3
- data/app/models/users/preference.rb +2 -1
- data/app/models/users/user.rb +67 -42
- data/app/views/accounts/_top_section.html.haml +1 -1
- data/app/views/accounts/edit.js.haml +1 -1
- data/app/views/accounts/update.js.haml +2 -2
- data/app/views/admin/users/_user.html.haml +4 -4
- data/app/views/campaigns/_metrics.html.haml +3 -3
- data/app/views/contacts/_index_brief.html.haml +1 -1
- data/app/views/contacts/_index_full.html.haml +1 -1
- data/app/views/contacts/_index_long.html.haml +1 -1
- data/app/views/devise/confirmations/new.html.haml +9 -0
- data/app/views/devise/mailer/confirmation_instructions.html.haml +4 -0
- data/app/views/devise/mailer/password_change.html.haml +3 -0
- data/app/views/devise/mailer/reset_password_instructions.html.haml +6 -0
- data/app/views/devise/passwords/edit.html.haml +18 -0
- data/app/views/devise/passwords/new.html.haml +10 -0
- data/app/views/devise/registrations/new.html.haml +21 -0
- data/app/views/devise/sessions/new.html.haml +32 -0
- data/app/views/home/_opportunity.html.haml +4 -19
- data/app/views/layouts/_about.html.haml +5 -5
- data/app/views/layouts/_header.html.haml +3 -3
- data/app/views/layouts/admin/_header.html.haml +1 -1
- data/app/views/opportunities/_index_long.html.haml +1 -24
- data/app/views/opportunities/_sidebar_show.html.haml +3 -3
- data/app/views/opportunities/_top_section.html.haml +1 -1
- data/app/views/shared/_address.html.haml +5 -5
- data/app/views/shared/_empty.html.haml +1 -1
- data/app/views/shared/_paginate_with_per_page.html.haml +1 -0
- data/app/views/users/_avatar.html.haml +1 -1
- data/bin/bundle +1 -1
- data/bin/rails +1 -1
- data/bin/setup +38 -0
- data/bin/update +33 -0
- data/bin/yarn +13 -0
- data/config/application.rb +8 -6
- data/config/boot.rb +1 -1
- data/config/brakeman.ignore +2 -2
- data/config/database.postgres.docker.yml +5 -5
- data/config/environment.rb +1 -1
- data/config/environments/development.rb +1 -0
- data/config/environments/test.rb +7 -0
- data/config/initializers/action_mailer.rb +1 -3
- data/config/initializers/application_controller_renderer.rb +9 -0
- data/config/initializers/assets.rb +6 -11
- data/config/initializers/backtrace_silencers.rb +0 -6
- data/config/initializers/content_security_policy.rb +26 -0
- data/config/initializers/cookies_serializer.rb +3 -6
- data/config/initializers/devise.rb +289 -0
- data/config/initializers/filter_parameter_logging.rb +0 -5
- data/config/initializers/gravatar.rb +0 -1
- data/config/initializers/inflections.rb +0 -6
- data/config/initializers/mime_types.rb +1 -9
- data/config/initializers/new_framework_defaults_5_2.rb +40 -0
- data/config/initializers/relative_url_root.rb +1 -3
- data/config/initializers/session_store.rb +1 -3
- data/config/initializers/wrap_parameters.rb +4 -9
- data/config/locales/fat_free_crm.en-GB.yml +5 -5
- data/config/locales/fat_free_crm.en-US.yml +5 -5
- data/config/locales/fat_free_crm.fr.yml +1 -1
- data/config/locales/fat_free_crm.ru.yml +1 -0
- data/config/routes.rb +20 -9
- data/db/demo/users.yml +62 -81
- data/db/migrate/20100928030620_remove_uuid.rb +1 -2
- data/db/migrate/20120316045804_activities_to_versions.rb +1 -0
- data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +1 -0
- data/db/migrate/20180107082701_authlogic_to_devise.rb +58 -0
- data/db/schema.rb +48 -46
- data/docker-compose.yml +10 -0
- data/fat_free_crm.gemspec +12 -14
- data/lib/development_tasks/license.rake +2 -2
- data/lib/fat_free_crm/callback.rb +2 -2
- data/lib/fat_free_crm/comment_extensions.rb +2 -4
- data/lib/fat_free_crm/core_ext/string.rb +1 -1
- data/lib/fat_free_crm/engine.rb +2 -2
- data/lib/fat_free_crm/errors.rb +1 -1
- data/lib/fat_free_crm/export_csv.rb +1 -0
- data/lib/fat_free_crm/exportable.rb +1 -1
- data/lib/fat_free_crm/fields.rb +2 -2
- data/lib/fat_free_crm/gem_dependencies.rb +1 -1
- data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +1 -3
- data/lib/fat_free_crm/i18n.rb +2 -2
- data/lib/fat_free_crm/mail_processor/base.rb +4 -10
- data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -15
- data/lib/fat_free_crm/permissions.rb +7 -18
- data/lib/fat_free_crm/sortable.rb +1 -1
- data/lib/fat_free_crm/tabs.rb +2 -2
- data/lib/fat_free_crm/version.rb +2 -2
- data/lib/gravatar_image_tag.rb +7 -8
- data/lib/missing_translation_detector.rb +1 -0
- data/lib/tasks/ffcrm/missing_translations.rake +1 -0
- data/lib/tasks/ffcrm/setup.rake +13 -4
- data/lib/tasks/ffcrm/update_data.rake +2 -2
- data/script/rails +2 -2
- data/spec/controllers/admin/users_controller_spec.rb +25 -81
- data/spec/controllers/comments_controller_spec.rb +19 -19
- data/spec/controllers/emails_controller_spec.rb +2 -2
- data/spec/controllers/entities/accounts_controller_spec.rb +56 -56
- data/spec/controllers/entities/campaigns_controller_spec.rb +66 -66
- data/spec/controllers/entities/contacts_controller_spec.rb +69 -68
- data/spec/controllers/entities/leads_controller_spec.rb +126 -126
- data/spec/controllers/entities/opportunities_controller_spec.rb +101 -101
- data/spec/controllers/entities_controller_spec.rb +5 -0
- data/spec/controllers/home_controller_spec.rb +30 -30
- data/spec/controllers/tasks_controller_spec.rb +42 -40
- data/spec/controllers/users_controller_spec.rb +43 -113
- data/spec/factories/account_factories.rb +13 -13
- data/spec/factories/campaign_factories.rb +8 -8
- data/spec/factories/contact_factories.rb +18 -18
- data/spec/factories/field_factories.rb +11 -10
- data/spec/factories/lead_factories.rb +13 -13
- data/spec/factories/list_factories.rb +3 -3
- data/spec/factories/opportunity_factories.rb +9 -9
- data/spec/factories/sequences.rb +1 -1
- data/spec/factories/setting_factories.rb +5 -5
- data/spec/factories/shared_factories.rb +25 -23
- data/spec/factories/subscription_factories.rb +1 -1
- data/spec/factories/tag_factories.rb +1 -1
- data/spec/factories/task_factories.rb +11 -11
- data/spec/factories/user_factories.rb +27 -30
- data/spec/features/accounts_spec.rb +17 -4
- data/spec/features/admin/groups_spec.rb +2 -2
- data/spec/features/admin/users_spec.rb +4 -2
- data/spec/features/campaigns_spec.rb +5 -5
- data/spec/features/contacts_spec.rb +11 -5
- data/spec/features/dashboard_spec.rb +8 -8
- data/spec/features/devise/sign_in_spec.rb +58 -0
- data/spec/features/devise/sign_up_spec.rb +36 -0
- data/spec/features/leads_spec.rb +5 -5
- data/spec/features/opportunities_overview_spec.rb +16 -16
- data/spec/features/opportunities_spec.rb +35 -9
- data/spec/features/support/autocomlete_helper.rb +17 -0
- data/spec/features/support/browser.rb +5 -9
- data/spec/features/tasks_spec.rb +5 -5
- data/spec/helpers/admin/field_groups_helper_spec.rb +1 -1
- data/spec/helpers/application_helper_spec.rb +1 -1
- data/spec/helpers/tasks_helper_spec.rb +1 -1
- data/spec/helpers/users_helper_spec.rb +7 -7
- data/spec/lib/comment_extensions_spec.rb +11 -5
- data/spec/lib/errors_spec.rb +2 -2
- data/spec/lib/mail_processor/base_spec.rb +3 -3
- data/spec/lib/mail_processor/comment_replies_spec.rb +3 -3
- data/spec/lib/mail_processor/dropbox_spec.rb +17 -17
- data/spec/lib/mail_processor/sample_emails/dropbox.rb +8 -8
- data/spec/lib/permissions_spec.rb +15 -28
- data/spec/mailers/devise_mailer_spec.rb +35 -0
- data/spec/mailers/user_mailer_spec.rb +6 -32
- data/spec/models/entities/account_spec.rb +58 -32
- data/spec/models/entities/campaign_spec.rb +18 -25
- data/spec/models/entities/contact_spec.rb +113 -21
- data/spec/models/entities/lead_spec.rb +9 -11
- data/spec/models/entities/opportunity_spec.rb +45 -45
- data/spec/models/fields/custom_field_date_pair_spec.rb +4 -2
- data/spec/models/fields/custom_field_spec.rb +21 -19
- data/spec/models/list_spec.rb +2 -2
- data/spec/models/observers/entity_observer_spec.rb +7 -7
- data/spec/models/polymorphic/address_spec.rb +1 -1
- data/spec/models/polymorphic/avatar_spec.rb +5 -5
- data/spec/models/polymorphic/comment_spec.rb +5 -5
- data/spec/models/polymorphic/task_spec.rb +65 -58
- data/spec/models/polymorphic/version_spec.rb +31 -31
- data/spec/models/setting_spec.rb +2 -2
- data/spec/models/users/preference_spec.rb +6 -6
- data/spec/models/users/user_spec.rb +46 -50
- data/spec/routing/users_routing_spec.rb +30 -8
- data/spec/shared/controllers.rb +3 -9
- data/spec/shared/models.rb +22 -22
- data/spec/spec_helper.rb +12 -4
- data/spec/support/assert_select.rb +1 -0
- data/spec/support/devise_helpers.rb +28 -0
- data/spec/{features/support/helpers.rb → support/feature_helpers.rb} +11 -11
- data/spec/support/macros.rb +7 -4
- data/spec/views/accounts/_edit.haml_spec.rb +1 -1
- data/spec/views/accounts/create.js.haml_spec.rb +3 -3
- data/spec/views/accounts/destroy.js.haml_spec.rb +1 -1
- data/spec/views/accounts/edit.js.haml_spec.rb +2 -2
- data/spec/views/accounts/index.haml_spec.rb +2 -2
- data/spec/views/accounts/index.js.haml_spec.rb +1 -1
- data/spec/views/accounts/show.haml_spec.rb +4 -4
- data/spec/views/accounts/update.js.haml_spec.rb +1 -1
- data/spec/views/admin/field_groups/create.js.haml_spec.rb +1 -1
- data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +1 -1
- data/spec/views/admin/field_groups/edit.js.haml_spec.rb +1 -1
- data/spec/views/admin/field_groups/new.js.haml_spec.rb +1 -1
- data/spec/views/admin/field_groups/update.js.haml_spec.rb +1 -1
- data/spec/views/admin/users/create.js.haml_spec.rb +2 -2
- data/spec/views/admin/users/destroy.js.haml_spec.rb +2 -2
- data/spec/views/admin/users/edit.js.haml_spec.rb +2 -2
- data/spec/views/admin/users/index.haml_spec.rb +1 -1
- data/spec/views/admin/users/index.js.haml_spec.rb +2 -2
- data/spec/views/admin/users/reactivate.js.haml_spec.rb +1 -1
- data/spec/views/admin/users/suspend.js.haml_spec.rb +1 -1
- data/spec/views/admin/users/update.js.haml_spec.rb +1 -1
- data/spec/views/application/auto_complete.haml_spec.rb +3 -3
- data/spec/views/campaigns/_edit.haml_spec.rb +1 -1
- data/spec/views/campaigns/create.js.haml_spec.rb +4 -4
- data/spec/views/campaigns/destroy.js.haml_spec.rb +1 -1
- data/spec/views/campaigns/edit.js.haml_spec.rb +4 -4
- data/spec/views/campaigns/index.haml_spec.rb +1 -1
- data/spec/views/campaigns/index.js.haml_spec.rb +2 -2
- data/spec/views/campaigns/show.haml_spec.rb +4 -4
- data/spec/views/campaigns/update.js.haml_spec.rb +2 -2
- data/spec/views/contacts/_edit.haml_spec.rb +7 -7
- data/spec/views/contacts/_new.haml_spec.rb +1 -1
- data/spec/views/contacts/create.js.haml_spec.rb +5 -5
- data/spec/views/contacts/destroy.js.haml_spec.rb +1 -1
- data/spec/views/contacts/edit.js.haml_spec.rb +4 -4
- data/spec/views/contacts/index.haml_spec.rb +1 -1
- data/spec/views/contacts/index.js.html_spec.rb +2 -2
- data/spec/views/contacts/new.js.haml_spec.rb +1 -1
- data/spec/views/contacts/show.haml_spec.rb +3 -3
- data/spec/views/contacts/update.js.haml_spec.rb +5 -5
- data/spec/views/home/index.haml_spec.rb +1 -1
- data/spec/views/home/index.js.haml_spec.rb +1 -1
- data/spec/views/home/options.js.haml_spec.rb +2 -2
- data/spec/views/leads/_convert.haml_spec.rb +3 -3
- data/spec/views/leads/_edit.haml_spec.rb +2 -2
- data/spec/views/leads/_new.haml_spec.rb +2 -2
- data/spec/views/leads/_sidebar_show.haml_spec.rb +5 -5
- data/spec/views/leads/convert.js.haml_spec.rb +4 -4
- data/spec/views/leads/create.js.haml_spec.rb +5 -5
- data/spec/views/leads/destroy.js.haml_spec.rb +2 -2
- data/spec/views/leads/edit.js.haml_spec.rb +4 -4
- data/spec/views/leads/index.haml_spec.rb +1 -1
- data/spec/views/leads/index.js.haml_spec.rb +1 -1
- data/spec/views/leads/new.js.haml_spec.rb +1 -1
- data/spec/views/leads/promote.js.haml_spec.rb +7 -7
- data/spec/views/leads/reject.js.haml_spec.rb +2 -2
- data/spec/views/leads/show.haml_spec.rb +2 -2
- data/spec/views/leads/update.js.haml_spec.rb +4 -4
- data/spec/views/opportunities/_edit.haml_spec.rb +7 -7
- data/spec/views/opportunities/_new.haml_spec.rb +2 -2
- data/spec/views/opportunities/create.js.haml_spec.rb +6 -6
- data/spec/views/opportunities/destroy.js.haml_spec.rb +3 -3
- data/spec/views/opportunities/edit.js.haml_spec.rb +3 -3
- data/spec/views/opportunities/index.haml_spec.rb +1 -1
- data/spec/views/opportunities/index.js.haml_spec.rb +1 -1
- data/spec/views/opportunities/new.js.haml_spec.rb +1 -1
- data/spec/views/opportunities/show.haml_spec.rb +3 -3
- data/spec/views/opportunities/update.js.haml_spec.rb +5 -5
- data/spec/views/tasks/_edit.haml_spec.rb +1 -1
- data/spec/views/tasks/complete.js.haml_spec.rb +4 -4
- data/spec/views/tasks/create.js.haml_spec.rb +6 -6
- data/spec/views/tasks/destroy.js.haml_spec.rb +2 -2
- data/spec/views/tasks/index.haml_spec.rb +4 -4
- data/spec/views/tasks/new.js.haml_spec.rb +1 -1
- data/spec/views/tasks/uncomplete.js.haml_spec.rb +2 -2
- data/spec/views/tasks/update.js.haml_spec.rb +18 -18
- data/spec/views/users/upload_avatar.js.haml_spec.rb +2 -2
- metadata +49 -71
- data/app/controllers/authentications_controller.rb +0 -53
- data/app/models/users/authentication.rb +0 -56
- data/app/views/authentications/new.html.haml +0 -19
- data/app/views/passwords/edit.html.haml +0 -15
- data/app/views/passwords/new.html.haml +0 -10
- data/app/views/user_mailer/password_reset_instructions.html.haml +0 -6
- data/app/views/users/new.html.haml +0 -19
- data/spec/controllers/authentications_controller_spec.rb +0 -150
- data/spec/controllers/passwords_controller_spec.rb +0 -32
- data/spec/models/users/authentication_spec.rb +0 -19
- data/spec/support/auth_macros.rb +0 -49
- data/spec/views/authentications/new.haml_spec.rb +0 -31
@@ -14,10 +14,9 @@ class RemoveUuid < ActiveRecord::Migration[4.2]
|
|
14
14
|
raise ActiveRecord::IrreversibleMigration, "Can't recover deleted UUIDs"
|
15
15
|
end
|
16
16
|
|
17
|
-
private
|
18
|
-
|
19
17
|
def self.uuid_configured?
|
20
18
|
return @@uuid_configured if @@uuid_configured
|
19
|
+
|
21
20
|
config = ActiveRecord::Base.connection.instance_variable_get("@config")
|
22
21
|
@@uuid_configured = config[:uuid]
|
23
22
|
end
|
@@ -18,6 +18,7 @@ class ActivitiesToVersions < ActiveRecord::Migration[4.2]
|
|
18
18
|
activities.each do |activity|
|
19
19
|
# commented and email activities don't translate well so ignore them
|
20
20
|
next unless event = events[activity['action']]
|
21
|
+
|
21
22
|
attributes = {
|
22
23
|
item_id: activity['subject_id'],
|
23
24
|
item_type: activity['subject_type'],
|
@@ -15,6 +15,7 @@ class AddNotNullConstraintsForTimestampColumns < ActiveRecord::Migration[4.2]
|
|
15
15
|
ActiveRecord::Base.connection.tables.each do |table|
|
16
16
|
# If table has both timestamp columns, set not null constraints on both columns.
|
17
17
|
next unless %i[created_at updated_at].all? { |column| column_exists?(table, column) }
|
18
|
+
|
18
19
|
%i[created_at updated_at].each do |column|
|
19
20
|
change_column table, column, :datetime, constraints
|
20
21
|
end
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class AuthlogicToDevise < ActiveRecord::Migration[5.1]
|
4
|
+
def self.up
|
5
|
+
add_column :users, :unconfirmed_email, :string, limit: 254
|
6
|
+
add_column :users, :reset_password_token, :string
|
7
|
+
add_column :users, :reset_password_sent_at, :datetime
|
8
|
+
add_column :users, :remember_token, :string
|
9
|
+
add_column :users, :remember_created_at, :datetime
|
10
|
+
add_column :users, :authentication_token, :string
|
11
|
+
add_column :users, :confirmation_token, :string, limit: 255
|
12
|
+
add_column :users, :confirmed_at, :timestamp
|
13
|
+
add_column :users, :confirmation_sent_at, :timestamp
|
14
|
+
execute "UPDATE users SET confirmed_at = created_at, confirmation_sent_at = created_at"
|
15
|
+
|
16
|
+
rename_column :users, :password_hash, :encrypted_password
|
17
|
+
|
18
|
+
rename_column :users, :current_login_at, :current_sign_in_at
|
19
|
+
rename_column :users, :last_login_at, :last_sign_in_at
|
20
|
+
rename_column :users, :current_login_ip, :current_sign_in_ip
|
21
|
+
rename_column :users, :last_login_ip, :last_sign_in_ip
|
22
|
+
rename_column :users, :login_count, :sign_in_count
|
23
|
+
|
24
|
+
remove_column :users, :persistence_token
|
25
|
+
remove_column :users, :single_access_token
|
26
|
+
remove_column :users, :perishable_token
|
27
|
+
|
28
|
+
add_index :users, :reset_password_token, unique: true
|
29
|
+
add_index :users, :remember_token, unique: true
|
30
|
+
add_index :users, :confirmation_token, unique: true
|
31
|
+
add_index :users, :authentication_token, unique: true
|
32
|
+
end
|
33
|
+
|
34
|
+
def self.down
|
35
|
+
add_column :users, :perishable_token, :string
|
36
|
+
add_column :users, :single_access_token, :string
|
37
|
+
add_column :users, :persistence_token, :string
|
38
|
+
|
39
|
+
rename_column :users, :encrypted_password, :password_hash
|
40
|
+
|
41
|
+
rename_column :users, :current_sign_in_at, :current_login_at
|
42
|
+
rename_column :users, :last_sign_in_at, :last_login_at
|
43
|
+
rename_column :users, :current_sign_in_ip, :current_login_ip
|
44
|
+
rename_column :users, :last_sign_in_ip, :last_login_ip
|
45
|
+
rename_column :users, :sign_in_count, :login_count
|
46
|
+
|
47
|
+
remove_column :users, :confirmation_token
|
48
|
+
remove_column :users, :confirmed_at
|
49
|
+
remove_column :users, :confirmation_sent_at
|
50
|
+
|
51
|
+
remove_column :users, :unconfirmed_email
|
52
|
+
remove_column :users, :authentication_token
|
53
|
+
remove_column :users, :remember_created_at
|
54
|
+
remove_column :users, :remember_token
|
55
|
+
remove_column :users, :reset_password_sent_at
|
56
|
+
remove_column :users, :reset_password_token
|
57
|
+
end
|
58
|
+
end
|
data/db/schema.rb
CHANGED
@@ -1,5 +1,3 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
1
|
# This file is auto-generated from the current state of the database. Instead
|
4
2
|
# of editing this file, please use the migrations feature of Active Record to
|
5
3
|
# incrementally modify your database, and then regenerate this schema definition.
|
@@ -12,12 +10,9 @@
|
|
12
10
|
#
|
13
11
|
# It's strongly recommended that you check this file into your version control system.
|
14
12
|
|
15
|
-
ActiveRecord::Schema.define(version:
|
16
|
-
|
17
|
-
# These are extensions that must be enabled in order to support this database
|
18
|
-
enable_extension "plpgsql"
|
13
|
+
ActiveRecord::Schema.define(version: 2018_01_07_082701) do
|
19
14
|
|
20
|
-
create_table "account_contacts",
|
15
|
+
create_table "account_contacts", force: :cascade do |t|
|
21
16
|
t.integer "account_id"
|
22
17
|
t.integer "contact_id"
|
23
18
|
t.datetime "deleted_at"
|
@@ -26,7 +21,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
26
21
|
t.index ["account_id", "contact_id"], name: "index_account_contacts_on_account_id_and_contact_id"
|
27
22
|
end
|
28
23
|
|
29
|
-
create_table "account_opportunities",
|
24
|
+
create_table "account_opportunities", force: :cascade do |t|
|
30
25
|
t.integer "account_id"
|
31
26
|
t.integer "opportunity_id"
|
32
27
|
t.datetime "deleted_at"
|
@@ -35,7 +30,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
35
30
|
t.index ["account_id", "opportunity_id"], name: "index_account_opportunities_on_account_id_and_opportunity_id"
|
36
31
|
end
|
37
32
|
|
38
|
-
create_table "accounts",
|
33
|
+
create_table "accounts", force: :cascade do |t|
|
39
34
|
t.integer "user_id"
|
40
35
|
t.integer "assigned_to"
|
41
36
|
t.string "name", limit: 64, default: "", null: false
|
@@ -54,12 +49,11 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
54
49
|
t.text "subscribed_users"
|
55
50
|
t.integer "contacts_count", default: 0
|
56
51
|
t.integer "opportunities_count", default: 0
|
57
|
-
t.integer "pipeline_opportunities_count", default: 0
|
58
52
|
t.index ["assigned_to"], name: "index_accounts_on_assigned_to"
|
59
53
|
t.index ["user_id", "name", "deleted_at"], name: "index_accounts_on_user_id_and_name_and_deleted_at", unique: true
|
60
54
|
end
|
61
55
|
|
62
|
-
create_table "activities",
|
56
|
+
create_table "activities", force: :cascade do |t|
|
63
57
|
t.integer "user_id"
|
64
58
|
t.string "subject_type"
|
65
59
|
t.integer "subject_id"
|
@@ -72,7 +66,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
72
66
|
t.index ["user_id"], name: "index_activities_on_user_id"
|
73
67
|
end
|
74
68
|
|
75
|
-
create_table "addresses",
|
69
|
+
create_table "addresses", force: :cascade do |t|
|
76
70
|
t.string "street1"
|
77
71
|
t.string "street2"
|
78
72
|
t.string "city", limit: 64
|
@@ -89,7 +83,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
89
83
|
t.index ["addressable_id", "addressable_type"], name: "index_addresses_on_addressable_id_and_addressable_type"
|
90
84
|
end
|
91
85
|
|
92
|
-
create_table "avatars",
|
86
|
+
create_table "avatars", force: :cascade do |t|
|
93
87
|
t.integer "user_id"
|
94
88
|
t.string "entity_type"
|
95
89
|
t.integer "entity_id"
|
@@ -100,7 +94,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
100
94
|
t.datetime "updated_at"
|
101
95
|
end
|
102
96
|
|
103
|
-
create_table "campaigns",
|
97
|
+
create_table "campaigns", force: :cascade do |t|
|
104
98
|
t.integer "user_id"
|
105
99
|
t.integer "assigned_to"
|
106
100
|
t.string "name", limit: 64, default: "", null: false
|
@@ -125,7 +119,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
125
119
|
t.index ["user_id", "name", "deleted_at"], name: "index_campaigns_on_user_id_and_name_and_deleted_at", unique: true
|
126
120
|
end
|
127
121
|
|
128
|
-
create_table "comments",
|
122
|
+
create_table "comments", force: :cascade do |t|
|
129
123
|
t.integer "user_id"
|
130
124
|
t.string "commentable_type"
|
131
125
|
t.integer "commentable_id"
|
@@ -137,7 +131,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
137
131
|
t.string "state", limit: 16, default: "Expanded", null: false
|
138
132
|
end
|
139
133
|
|
140
|
-
create_table "contact_opportunities",
|
134
|
+
create_table "contact_opportunities", force: :cascade do |t|
|
141
135
|
t.integer "contact_id"
|
142
136
|
t.integer "opportunity_id"
|
143
137
|
t.string "role", limit: 32
|
@@ -147,7 +141,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
147
141
|
t.index ["contact_id", "opportunity_id"], name: "index_contact_opportunities_on_contact_id_and_opportunity_id"
|
148
142
|
end
|
149
143
|
|
150
|
-
create_table "contacts",
|
144
|
+
create_table "contacts", force: :cascade do |t|
|
151
145
|
t.integer "user_id"
|
152
146
|
t.integer "lead_id"
|
153
147
|
t.integer "assigned_to"
|
@@ -179,7 +173,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
179
173
|
t.index ["user_id", "last_name", "deleted_at"], name: "id_last_name_deleted", unique: true
|
180
174
|
end
|
181
175
|
|
182
|
-
create_table "emails",
|
176
|
+
create_table "emails", force: :cascade do |t|
|
183
177
|
t.string "imap_message_id", null: false
|
184
178
|
t.integer "user_id"
|
185
179
|
t.string "mediator_type"
|
@@ -200,7 +194,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
200
194
|
t.index ["mediator_id", "mediator_type"], name: "index_emails_on_mediator_id_and_mediator_type"
|
201
195
|
end
|
202
196
|
|
203
|
-
create_table "field_groups",
|
197
|
+
create_table "field_groups", force: :cascade do |t|
|
204
198
|
t.string "name", limit: 64
|
205
199
|
t.string "label", limit: 128
|
206
200
|
t.integer "position"
|
@@ -211,7 +205,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
211
205
|
t.string "klass_name", limit: 32
|
212
206
|
end
|
213
207
|
|
214
|
-
create_table "fields",
|
208
|
+
create_table "fields", force: :cascade do |t|
|
215
209
|
t.string "type"
|
216
210
|
t.integer "field_group_id"
|
217
211
|
t.integer "position"
|
@@ -223,17 +217,17 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
223
217
|
t.text "collection"
|
224
218
|
t.boolean "disabled"
|
225
219
|
t.boolean "required"
|
226
|
-
t.integer "maxlength"
|
220
|
+
t.integer "maxlength", limit: 4
|
227
221
|
t.datetime "created_at"
|
228
222
|
t.datetime "updated_at"
|
229
223
|
t.integer "pair_id"
|
230
224
|
t.text "settings"
|
231
|
-
t.integer "minlength", default: 0
|
225
|
+
t.integer "minlength", limit: 4, default: 0
|
232
226
|
t.index ["field_group_id"], name: "index_fields_on_field_group_id"
|
233
227
|
t.index ["name"], name: "index_fields_on_name"
|
234
228
|
end
|
235
229
|
|
236
|
-
create_table "groups",
|
230
|
+
create_table "groups", force: :cascade do |t|
|
237
231
|
t.string "name"
|
238
232
|
t.datetime "created_at"
|
239
233
|
t.datetime "updated_at"
|
@@ -247,7 +241,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
247
241
|
t.index ["user_id"], name: "index_groups_users_on_user_id"
|
248
242
|
end
|
249
243
|
|
250
|
-
create_table "leads",
|
244
|
+
create_table "leads", force: :cascade do |t|
|
251
245
|
t.integer "user_id"
|
252
246
|
t.integer "campaign_id"
|
253
247
|
t.integer "assigned_to"
|
@@ -279,7 +273,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
279
273
|
t.index ["user_id", "last_name", "deleted_at"], name: "index_leads_on_user_id_and_last_name_and_deleted_at", unique: true
|
280
274
|
end
|
281
275
|
|
282
|
-
create_table "lists",
|
276
|
+
create_table "lists", force: :cascade do |t|
|
283
277
|
t.string "name"
|
284
278
|
t.text "url"
|
285
279
|
t.datetime "created_at"
|
@@ -288,7 +282,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
288
282
|
t.index ["user_id"], name: "index_lists_on_user_id"
|
289
283
|
end
|
290
284
|
|
291
|
-
create_table "opportunities",
|
285
|
+
create_table "opportunities", force: :cascade do |t|
|
292
286
|
t.integer "user_id"
|
293
287
|
t.integer "campaign_id"
|
294
288
|
t.integer "assigned_to"
|
@@ -309,7 +303,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
309
303
|
t.index ["user_id", "name", "deleted_at"], name: "id_name_deleted", unique: true
|
310
304
|
end
|
311
305
|
|
312
|
-
create_table "permissions",
|
306
|
+
create_table "permissions", force: :cascade do |t|
|
313
307
|
t.integer "user_id"
|
314
308
|
t.string "asset_type"
|
315
309
|
t.integer "asset_id"
|
@@ -321,7 +315,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
321
315
|
t.index ["user_id"], name: "index_permissions_on_user_id"
|
322
316
|
end
|
323
317
|
|
324
|
-
create_table "preferences",
|
318
|
+
create_table "preferences", force: :cascade do |t|
|
325
319
|
t.integer "user_id"
|
326
320
|
t.string "name", limit: 32, default: "", null: false
|
327
321
|
t.text "value"
|
@@ -330,7 +324,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
330
324
|
t.index ["user_id", "name"], name: "index_preferences_on_user_id_and_name"
|
331
325
|
end
|
332
326
|
|
333
|
-
create_table "sessions",
|
327
|
+
create_table "sessions", force: :cascade do |t|
|
334
328
|
t.string "session_id", null: false
|
335
329
|
t.text "data"
|
336
330
|
t.datetime "created_at"
|
@@ -339,7 +333,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
339
333
|
t.index ["updated_at"], name: "index_sessions_on_updated_at"
|
340
334
|
end
|
341
335
|
|
342
|
-
create_table "settings",
|
336
|
+
create_table "settings", force: :cascade do |t|
|
343
337
|
t.string "name", limit: 32, default: "", null: false
|
344
338
|
t.text "value"
|
345
339
|
t.datetime "created_at"
|
@@ -347,7 +341,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
347
341
|
t.index ["name"], name: "index_settings_on_name"
|
348
342
|
end
|
349
343
|
|
350
|
-
create_table "taggings",
|
344
|
+
create_table "taggings", force: :cascade do |t|
|
351
345
|
t.integer "tag_id"
|
352
346
|
t.integer "taggable_id"
|
353
347
|
t.integer "tagger_id"
|
@@ -359,13 +353,13 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
359
353
|
t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
|
360
354
|
end
|
361
355
|
|
362
|
-
create_table "tags",
|
356
|
+
create_table "tags", force: :cascade do |t|
|
363
357
|
t.string "name"
|
364
358
|
t.integer "taggings_count", default: 0
|
365
359
|
t.index ["name"], name: "index_tags_on_name", unique: true
|
366
360
|
end
|
367
361
|
|
368
|
-
create_table "tasks",
|
362
|
+
create_table "tasks", force: :cascade do |t|
|
369
363
|
t.integer "user_id"
|
370
364
|
t.integer "assigned_to"
|
371
365
|
t.integer "completed_by"
|
@@ -386,7 +380,7 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
386
380
|
t.index ["user_id", "name", "deleted_at"], name: "index_tasks_on_user_id_and_name_and_deleted_at", unique: true
|
387
381
|
end
|
388
382
|
|
389
|
-
create_table "users",
|
383
|
+
create_table "users", force: :cascade do |t|
|
390
384
|
t.string "username", limit: 32, default: "", null: false
|
391
385
|
t.string "email", limit: 254, default: "", null: false
|
392
386
|
t.string "first_name", limit: 32
|
@@ -400,28 +394,36 @@ ActiveRecord::Schema.define(version: 20180103223438) do
|
|
400
394
|
t.string "yahoo", limit: 32
|
401
395
|
t.string "google", limit: 32
|
402
396
|
t.string "skype", limit: 32
|
403
|
-
t.string "
|
397
|
+
t.string "encrypted_password", default: "", null: false
|
404
398
|
t.string "password_salt", default: "", null: false
|
405
|
-
t.
|
406
|
-
t.
|
407
|
-
t.
|
408
|
-
t.
|
409
|
-
t.
|
410
|
-
t.string "current_login_ip"
|
411
|
-
t.integer "login_count", default: 0, null: false
|
399
|
+
t.datetime "last_sign_in_at"
|
400
|
+
t.datetime "current_sign_in_at"
|
401
|
+
t.string "last_sign_in_ip"
|
402
|
+
t.string "current_sign_in_ip"
|
403
|
+
t.integer "sign_in_count", default: 0, null: false
|
412
404
|
t.datetime "deleted_at"
|
413
405
|
t.datetime "created_at"
|
414
406
|
t.datetime "updated_at"
|
415
407
|
t.boolean "admin", default: false, null: false
|
416
408
|
t.datetime "suspended_at"
|
417
|
-
t.string "
|
409
|
+
t.string "unconfirmed_email", limit: 254
|
410
|
+
t.string "reset_password_token"
|
411
|
+
t.datetime "reset_password_sent_at"
|
412
|
+
t.string "remember_token"
|
413
|
+
t.datetime "remember_created_at"
|
414
|
+
t.string "authentication_token"
|
415
|
+
t.string "confirmation_token", limit: 255
|
416
|
+
t.datetime "confirmed_at"
|
417
|
+
t.datetime "confirmation_sent_at"
|
418
|
+
t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
|
419
|
+
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
|
418
420
|
t.index ["email"], name: "index_users_on_email"
|
419
|
-
t.index ["
|
420
|
-
t.index ["
|
421
|
+
t.index ["remember_token"], name: "index_users_on_remember_token", unique: true
|
422
|
+
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
|
421
423
|
t.index ["username", "deleted_at"], name: "index_users_on_username_and_deleted_at", unique: true
|
422
424
|
end
|
423
425
|
|
424
|
-
create_table "versions",
|
426
|
+
create_table "versions", force: :cascade do |t|
|
425
427
|
t.string "item_type", null: false
|
426
428
|
t.integer "item_id", null: false
|
427
429
|
t.string "event", limit: 512, null: false
|
data/docker-compose.yml
CHANGED
@@ -5,13 +5,23 @@ services:
|
|
5
5
|
links:
|
6
6
|
- db
|
7
7
|
ports:
|
8
|
+
- "3000:3000"
|
8
9
|
- "80:80"
|
9
10
|
volumes:
|
10
11
|
- gems:/usr/local/rvm/gems
|
11
12
|
environment:
|
12
13
|
RAILS_ENV: 'production'
|
13
14
|
PASSENGER_APP_ENV: 'production'
|
15
|
+
DB_DATABASE: 'fat_free_crm_production'
|
16
|
+
DB_USERNAME: 'postgres'
|
17
|
+
DB_PASSWORD: ''
|
18
|
+
DB_HOST: 'db'
|
19
|
+
DB_PORT: 5432
|
14
20
|
db:
|
15
21
|
image: postgres:9.5
|
22
|
+
restart: always
|
23
|
+
volumes:
|
24
|
+
- pgdata:/var/lib/postgresql/data
|
16
25
|
volumes:
|
26
|
+
pgdata: {}
|
17
27
|
gems: {}
|
data/fat_free_crm.gemspec
CHANGED
@@ -1,27 +1,27 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
$LOAD_PATH.push File.expand_path('
|
3
|
+
$LOAD_PATH.push File.expand_path('vendor/gems/globby-0.1.2/lib', __dir__)
|
4
4
|
require 'globby'
|
5
|
-
rules = File.read("#{File.expand_path(
|
5
|
+
rules = File.read("#{File.expand_path(__dir__)}/.gitignore").split("\n")
|
6
6
|
rules << '.git'
|
7
7
|
files = Globby.reject(rules)
|
8
8
|
|
9
|
-
$LOAD_PATH.push File.expand_path('
|
9
|
+
$LOAD_PATH.push File.expand_path('lib', __dir__)
|
10
10
|
require 'fat_free_crm/version'
|
11
11
|
|
12
12
|
Gem::Specification.new do |gem|
|
13
13
|
gem.name = 'fat_free_crm'
|
14
|
-
gem.authors = ['Michael Dvorkin', '
|
14
|
+
gem.authors = ['Michael Dvorkin', 'Stephen Kenworthy', "Daniel O'Connor"]
|
15
15
|
gem.summary = 'Fat Free CRM'
|
16
16
|
gem.description = 'An open source, Ruby on Rails customer relationship management platform'
|
17
17
|
gem.homepage = 'http://fatfreecrm.com'
|
18
|
-
gem.email = ['mike@fatfreecrm.com', '
|
18
|
+
gem.email = ['mike@fatfreecrm.com', 'steveyken@gmail.com', 'daniel.oconnor@gmail.com']
|
19
19
|
gem.files = files
|
20
20
|
gem.version = FatFreeCRM::VERSION::STRING
|
21
|
-
gem.required_ruby_version = '>= 2.
|
21
|
+
gem.required_ruby_version = '>= 2.4.0'
|
22
22
|
gem.license = 'MIT'
|
23
23
|
|
24
|
-
gem.add_dependency 'rails', '~> 5.
|
24
|
+
gem.add_dependency 'rails', '~> 5.2.0'
|
25
25
|
gem.add_dependency 'rails-i18n'
|
26
26
|
gem.add_dependency 'rails-observers'
|
27
27
|
gem.add_dependency 'activemodel-serializers-xml'
|
@@ -34,10 +34,9 @@ Gem::Specification.new do |gem|
|
|
34
34
|
gem.add_dependency 'simple_form'
|
35
35
|
gem.add_dependency 'will_paginate'
|
36
36
|
gem.add_dependency 'paperclip'
|
37
|
-
|
38
|
-
gem.add_dependency '
|
39
|
-
gem.add_dependency '
|
40
|
-
gem.add_dependency 'authlogic', '>= 3.4.4'
|
37
|
+
gem.add_dependency 'paper_trail', '~> 10.0.0'
|
38
|
+
gem.add_dependency 'devise', '~> 4.6'
|
39
|
+
gem.add_dependency 'devise-encryptable', '~> 0.2.0'
|
41
40
|
gem.add_dependency 'acts_as_commentable'
|
42
41
|
gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'
|
43
42
|
gem.add_dependency 'dynamic_form'
|
@@ -45,7 +44,7 @@ Gem::Specification.new do |gem|
|
|
45
44
|
gem.add_dependency 'sass'
|
46
45
|
gem.add_dependency 'acts_as_list'
|
47
46
|
gem.add_dependency 'ffaker', '>= 2'
|
48
|
-
gem.add_dependency 'cancancan'
|
47
|
+
gem.add_dependency 'cancancan', '~> 3.0.0'
|
49
48
|
gem.add_dependency 'font-awesome-rails'
|
50
49
|
gem.add_dependency 'premailer'
|
51
50
|
gem.add_dependency 'nokogiri'
|
@@ -58,7 +57,6 @@ Gem::Specification.new do |gem|
|
|
58
57
|
|
59
58
|
# FatFreeCRM has released it's own versions of the following gems:
|
60
59
|
#-----------------------------------------------------------------
|
61
|
-
gem.add_dependency '
|
62
|
-
gem.add_dependency 'ransack', '~> 1.7', '>= 1.6.2'
|
60
|
+
gem.add_dependency 'ransack', '>= 1.6.2'
|
63
61
|
gem.add_dependency 'email_reply_parser_ffcrm'
|
64
62
|
end
|