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.

Files changed (783) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +44 -5
  4. data/.rubocop_todo.yml +23 -359
  5. data/.travis.yml +21 -21
  6. data/CHANGELOG.md +42 -9
  7. data/Capfile +2 -0
  8. data/Gemfile +4 -1
  9. data/Gemfile.lock +27 -25
  10. data/Guardfile +2 -0
  11. data/README.md +5 -5
  12. data/Rakefile +2 -0
  13. data/Vagrantfile +92 -0
  14. data/app/assets/javascripts/application.js.erb +0 -2
  15. data/app/assets/javascripts/crm.js.coffee +16 -20
  16. data/app/assets/stylesheets/application.css.erb +0 -2
  17. data/app/controllers/admin/application_controller.rb +3 -1
  18. data/app/controllers/admin/field_groups_controller.rb +2 -0
  19. data/app/controllers/admin/fields_controller.rb +4 -5
  20. data/app/controllers/admin/groups_controller.rb +2 -0
  21. data/app/controllers/admin/plugins_controller.rb +3 -7
  22. data/app/controllers/admin/settings_controller.rb +3 -5
  23. data/app/controllers/admin/tags_controller.rb +3 -5
  24. data/app/controllers/admin/users_controller.rb +4 -2
  25. data/app/controllers/application_controller.rb +16 -16
  26. data/app/controllers/authentications_controller.rb +4 -2
  27. data/app/controllers/comments_controller.rb +5 -4
  28. data/app/controllers/emails_controller.rb +2 -0
  29. data/app/controllers/entities/accounts_controller.rb +14 -7
  30. data/app/controllers/entities/campaigns_controller.rb +15 -8
  31. data/app/controllers/entities/contacts_controller.rb +28 -21
  32. data/app/controllers/entities/leads_controller.rb +33 -22
  33. data/app/controllers/entities/opportunities_controller.rb +33 -26
  34. data/app/controllers/entities_controller.rb +15 -1
  35. data/app/controllers/home_controller.rb +10 -5
  36. data/app/controllers/lists_controller.rb +3 -5
  37. data/app/controllers/passwords_controller.rb +3 -1
  38. data/app/controllers/tasks_controller.rb +11 -9
  39. data/app/controllers/users_controller.rb +4 -1
  40. data/app/helpers/accounts_helper.rb +14 -19
  41. data/app/helpers/addresses_helper.rb +2 -0
  42. data/app/helpers/admin/application_helper.rb +3 -2
  43. data/app/helpers/admin/field_groups_helper.rb +2 -0
  44. data/app/helpers/admin/fields_helper.rb +2 -0
  45. data/app/helpers/admin/plugins_helper.rb +2 -0
  46. data/app/helpers/admin/settings_helper.rb +2 -0
  47. data/app/helpers/admin/tags_helper.rb +2 -0
  48. data/app/helpers/admin/users_helper.rb +37 -17
  49. data/app/helpers/application_helper.rb +62 -68
  50. data/app/helpers/authentications_helper.rb +2 -0
  51. data/app/helpers/campaigns_helper.rb +3 -1
  52. data/app/helpers/comments_helper.rb +2 -0
  53. data/app/helpers/contacts_helper.rb +5 -3
  54. data/app/helpers/emails_helper.rb +2 -0
  55. data/app/helpers/fields_helper.rb +2 -0
  56. data/app/helpers/groups_helper.rb +2 -0
  57. data/app/helpers/home_helper.rb +2 -0
  58. data/app/helpers/javascript_helper.rb +2 -0
  59. data/app/helpers/leads_helper.rb +4 -3
  60. data/app/helpers/lists_helper.rb +2 -0
  61. data/app/helpers/opportunities_helper.rb +11 -11
  62. data/app/helpers/passwords_helper.rb +2 -0
  63. data/app/helpers/remote_link_pagination_helper.rb +2 -0
  64. data/app/helpers/tags_helper.rb +4 -2
  65. data/app/helpers/tasks_helper.rb +11 -10
  66. data/app/helpers/users_helper.rb +3 -1
  67. data/app/helpers/versions_helper.rb +2 -0
  68. data/app/inputs/date_pair_input.rb +2 -0
  69. data/app/inputs/date_time_input.rb +2 -0
  70. data/app/inputs/datetime_pair_input.rb +2 -0
  71. data/app/inputs/text_input.rb +2 -0
  72. data/app/mailers/dropbox_mailer.rb +2 -0
  73. data/app/mailers/subscription_mailer.rb +14 -8
  74. data/app/mailers/user_mailer.rb +3 -2
  75. data/app/models/entities/account.rb +17 -9
  76. data/app/models/entities/account_contact.rb +3 -1
  77. data/app/models/entities/account_opportunity.rb +3 -1
  78. data/app/models/entities/campaign.rb +3 -1
  79. data/app/models/entities/contact.rb +9 -7
  80. data/app/models/entities/contact_opportunity.rb +2 -0
  81. data/app/models/entities/lead.rb +3 -1
  82. data/app/models/entities/opportunity.rb +3 -1
  83. data/app/models/fields/core_field.rb +3 -0
  84. data/app/models/fields/custom_field.rb +8 -5
  85. data/app/models/fields/custom_field_date_pair.rb +3 -1
  86. data/app/models/fields/custom_field_datetime_pair.rb +3 -1
  87. data/app/models/fields/custom_field_pair.rb +2 -0
  88. data/app/models/fields/field.rb +9 -4
  89. data/app/models/fields/field_group.rb +3 -1
  90. data/app/models/list.rb +2 -0
  91. data/app/models/observers/entity_observer.rb +2 -0
  92. data/app/models/observers/lead_observer.rb +3 -1
  93. data/app/models/observers/opportunity_observer.rb +5 -3
  94. data/app/models/observers/task_observer.rb +2 -0
  95. data/app/models/polymorphic/address.rb +2 -0
  96. data/app/models/polymorphic/avatar.rb +2 -0
  97. data/app/models/polymorphic/comment.rb +2 -0
  98. data/app/models/polymorphic/email.rb +2 -0
  99. data/app/models/polymorphic/tag.rb +2 -0
  100. data/app/models/polymorphic/tagging.rb +2 -0
  101. data/app/models/polymorphic/task.rb +9 -8
  102. data/app/models/polymorphic/version.rb +3 -1
  103. data/app/models/setting.rb +16 -0
  104. data/app/models/users/ability.rb +2 -0
  105. data/app/models/users/authentication.rb +2 -0
  106. data/app/models/users/group.rb +2 -0
  107. data/app/models/users/permission.rb +2 -0
  108. data/app/models/users/preference.rb +2 -0
  109. data/app/models/users/user.rb +15 -15
  110. data/app/views/accounts/_account.html.haml +3 -3
  111. data/app/views/accounts/_contact_info.html.haml +7 -7
  112. data/app/views/accounts/_edit.html.haml +8 -8
  113. data/app/views/accounts/_index_brief.html.haml +11 -11
  114. data/app/views/accounts/_index_long.html.haml +12 -12
  115. data/app/views/accounts/_new.html.haml +9 -9
  116. data/app/views/accounts/_sidebar_index.html.haml +5 -5
  117. data/app/views/accounts/_sidebar_show.html.haml +11 -11
  118. data/app/views/accounts/_title_bar.html.haml +2 -2
  119. data/app/views/accounts/_top_section.html.haml +8 -8
  120. data/app/views/accounts/create.js.haml +3 -3
  121. data/app/views/accounts/destroy.js.haml +1 -1
  122. data/app/views/accounts/edit.js.haml +4 -4
  123. data/app/views/accounts/index.js.haml +4 -4
  124. data/app/views/accounts/index.xls.builder +3 -1
  125. data/app/views/accounts/new.js.haml +1 -1
  126. data/app/views/accounts/show.html.haml +8 -8
  127. data/app/views/accounts/show.js.haml +1 -1
  128. data/app/views/accounts/update.js.haml +2 -2
  129. data/app/views/admin/custom_fields/_base_field.html.haml +4 -2
  130. data/app/views/admin/custom_fields/_check_boxes_field.html.haml +2 -2
  131. data/app/views/admin/custom_fields/_date_field.html.haml +1 -1
  132. data/app/views/admin/custom_fields/_date_pair_field.html.haml +2 -2
  133. data/app/views/admin/custom_fields/_datetime_field.html.haml +1 -1
  134. data/app/views/admin/custom_fields/_datetime_pair_field.html.haml +2 -2
  135. data/app/views/admin/custom_fields/_radio_field.html.haml +2 -2
  136. data/app/views/admin/custom_fields/_select_field.html.haml +1 -1
  137. data/app/views/admin/custom_fields/_string_field.html.haml +1 -1
  138. data/app/views/admin/field_groups/_confirm.html.haml +1 -1
  139. data/app/views/admin/field_groups/_edit.html.haml +3 -3
  140. data/app/views/admin/field_groups/_field_group.html.haml +9 -9
  141. data/app/views/admin/field_groups/_new.html.haml +4 -4
  142. data/app/views/admin/field_groups/_top_section.html.haml +3 -3
  143. data/app/views/admin/field_groups/confirm.js.haml +1 -1
  144. data/app/views/admin/field_groups/create.js.haml +2 -2
  145. data/app/views/admin/field_groups/edit.js.haml +1 -1
  146. data/app/views/admin/field_groups/new.js.haml +1 -1
  147. data/app/views/admin/field_groups/update.js.haml +1 -1
  148. data/app/views/admin/fields/_field.html.haml +4 -4
  149. data/app/views/admin/fields/_form.html.haml +10 -10
  150. data/app/views/admin/fields/_subform.html.haml +2 -2
  151. data/app/views/admin/fields/create.js.haml +2 -2
  152. data/app/views/admin/fields/edit.js.haml +1 -1
  153. data/app/views/admin/fields/index.html.haml +6 -6
  154. data/app/views/admin/fields/show.html.haml +1 -1
  155. data/app/views/admin/fields/update.js.haml +2 -2
  156. data/app/views/admin/groups/_edit.html.haml +3 -3
  157. data/app/views/admin/groups/_form.html.haml +1 -1
  158. data/app/views/admin/groups/_group.html.haml +4 -4
  159. data/app/views/admin/groups/_new.html.haml +3 -3
  160. data/app/views/admin/groups/create.js.haml +2 -2
  161. data/app/views/admin/groups/edit.js.haml +2 -2
  162. data/app/views/admin/groups/index.html.haml +3 -3
  163. data/app/views/admin/groups/index.js.haml +2 -2
  164. data/app/views/admin/groups/new.js.haml +1 -1
  165. data/app/views/admin/groups/update.js.haml +2 -2
  166. data/app/views/admin/plugins/_plugin.html.haml +1 -1
  167. data/app/views/admin/tags/_confirm.html.haml +2 -2
  168. data/app/views/admin/tags/_edit.html.haml +3 -3
  169. data/app/views/admin/tags/_new.html.haml +3 -3
  170. data/app/views/admin/tags/_tag.html.haml +4 -4
  171. data/app/views/admin/tags/confirm.js.haml +1 -1
  172. data/app/views/admin/tags/create.js.haml +2 -2
  173. data/app/views/admin/tags/edit.js.haml +3 -3
  174. data/app/views/admin/tags/index.html.haml +3 -3
  175. data/app/views/admin/tags/new.js.haml +1 -1
  176. data/app/views/admin/tags/update.js.haml +2 -2
  177. data/app/views/admin/users/_confirm.html.haml +1 -1
  178. data/app/views/admin/users/_edit.html.haml +3 -3
  179. data/app/views/admin/users/_new.html.haml +3 -3
  180. data/app/views/admin/users/_profile.html.haml +3 -3
  181. data/app/views/admin/users/_user.html.haml +16 -16
  182. data/app/views/admin/users/confirm.js.haml +1 -1
  183. data/app/views/admin/users/create.js.haml +2 -2
  184. data/app/views/admin/users/edit.js.haml +3 -3
  185. data/app/views/admin/users/index.html.haml +3 -3
  186. data/app/views/admin/users/index.js.haml +2 -2
  187. data/app/views/admin/users/new.js.haml +1 -1
  188. data/app/views/admin/users/reactivate.js.haml +1 -1
  189. data/app/views/admin/users/suspend.js.haml +1 -1
  190. data/app/views/admin/users/update.js.haml +2 -2
  191. data/app/views/application/_auto_complete.html.haml +3 -3
  192. data/app/views/application/index.atom.builder +10 -6
  193. data/app/views/application/index.rss.builder +3 -1
  194. data/app/views/application/show.atom.builder +11 -7
  195. data/app/views/application/show.rss.builder +4 -2
  196. data/app/views/authentications/new.html.haml +1 -1
  197. data/app/views/campaigns/_campaign.html.haml +3 -3
  198. data/app/views/campaigns/_edit.html.haml +7 -7
  199. data/app/views/campaigns/_index_brief.html.haml +3 -3
  200. data/app/views/campaigns/_index_long.html.haml +5 -5
  201. data/app/views/campaigns/_metrics.html.haml +5 -5
  202. data/app/views/campaigns/_new.html.haml +8 -8
  203. data/app/views/campaigns/_objectives.html.haml +6 -6
  204. data/app/views/campaigns/_sidebar_index.html.haml +5 -5
  205. data/app/views/campaigns/_sidebar_show.html.haml +10 -10
  206. data/app/views/campaigns/_status.html.haml +1 -1
  207. data/app/views/campaigns/_title_bar.html.haml +2 -2
  208. data/app/views/campaigns/_top_section.html.haml +9 -9
  209. data/app/views/campaigns/create.js.haml +3 -3
  210. data/app/views/campaigns/destroy.js.haml +1 -1
  211. data/app/views/campaigns/edit.js.haml +4 -4
  212. data/app/views/campaigns/index.js.haml +4 -4
  213. data/app/views/campaigns/index.xls.builder +22 -20
  214. data/app/views/campaigns/new.js.haml +1 -1
  215. data/app/views/campaigns/show.html.haml +9 -9
  216. data/app/views/campaigns/show.js.haml +1 -1
  217. data/app/views/campaigns/update.js.haml +2 -2
  218. data/app/views/comments/_comment.html.haml +5 -5
  219. data/app/views/comments/_edit.html.haml +5 -5
  220. data/app/views/comments/_new.html.haml +15 -15
  221. data/app/views/comments/_subscription_links.html.haml +3 -3
  222. data/app/views/comments/create.js.haml +1 -1
  223. data/app/views/comments/edit.js.haml +2 -2
  224. data/app/views/comments/update.js.haml +2 -2
  225. data/app/views/contacts/_contact.html.haml +3 -3
  226. data/app/views/contacts/_contacts.html.haml +2 -2
  227. data/app/views/contacts/_edit.html.haml +9 -9
  228. data/app/views/contacts/_extra.html.haml +3 -3
  229. data/app/views/contacts/_index_brief.html.haml +3 -3
  230. data/app/views/contacts/_index_full.html.haml +11 -11
  231. data/app/views/contacts/_index_long.html.haml +5 -5
  232. data/app/views/contacts/_new.html.haml +10 -10
  233. data/app/views/contacts/_section_extra.html.haml +1 -1
  234. data/app/views/contacts/_section_general.html.haml +1 -1
  235. data/app/views/contacts/_sidebar_show.html.haml +8 -8
  236. data/app/views/contacts/_title_bar.html.haml +2 -2
  237. data/app/views/contacts/_top_section.html.haml +9 -9
  238. data/app/views/contacts/create.js.haml +4 -4
  239. data/app/views/contacts/destroy.js.haml +2 -2
  240. data/app/views/contacts/edit.js.haml +4 -4
  241. data/app/views/contacts/index.js.haml +4 -4
  242. data/app/views/contacts/index.xls.builder +3 -1
  243. data/app/views/contacts/new.js.haml +1 -1
  244. data/app/views/contacts/show.html.haml +7 -7
  245. data/app/views/contacts/show.js.haml +1 -1
  246. data/app/views/contacts/update.js.haml +3 -3
  247. data/app/views/emails/_email.html.haml +6 -6
  248. data/app/views/entities/_basic_search.html.haml +3 -3
  249. data/app/views/entities/_permissions.html.haml +10 -10
  250. data/app/views/entities/_search.html.haml +6 -6
  251. data/app/views/entities/_section_custom_fields.html.haml +3 -3
  252. data/app/views/entities/_title_bar.html.haml +3 -3
  253. data/app/views/entities/attach.js.haml +2 -2
  254. data/app/views/entities/contacts.js.haml +2 -2
  255. data/app/views/entities/leads.js.haml +2 -2
  256. data/app/views/entities/opportunities.js.haml +2 -2
  257. data/app/views/entities/subscription_update.js.haml +1 -1
  258. data/app/views/entities/versions.js.haml +2 -2
  259. data/app/views/fields/_edit_custom_field_group.html.haml +2 -2
  260. data/app/views/fields/_group.html.haml +5 -5
  261. data/app/views/fields/_group_table.html.haml +2 -2
  262. data/app/views/fields/_groups.html.haml +1 -1
  263. data/app/views/fields/_sidebar_show.html.haml +1 -1
  264. data/app/views/fields/group.js.erb +1 -1
  265. data/app/views/home/_account.html.haml +11 -11
  266. data/app/views/home/_activity.html.haml +7 -7
  267. data/app/views/home/_assets_menu.html.haml +1 -1
  268. data/app/views/home/_opportunity.html.haml +8 -8
  269. data/app/views/home/_options.html.haml +2 -2
  270. data/app/views/home/_task.html.haml +7 -7
  271. data/app/views/home/index.atom.builder +5 -3
  272. data/app/views/home/index.html.haml +6 -6
  273. data/app/views/home/index.js.haml +3 -3
  274. data/app/views/home/index.rss.builder +2 -0
  275. data/app/views/home/options.js.haml +1 -1
  276. data/app/views/layouts/500.html.haml +2 -2
  277. data/app/views/layouts/_footer.html.haml +1 -1
  278. data/app/views/layouts/_header.html.haml +3 -3
  279. data/app/views/layouts/_jumpbox.html.haml +1 -1
  280. data/app/views/layouts/_tabbed.html.haml +4 -4
  281. data/app/views/layouts/_tabless.html.haml +1 -1
  282. data/app/views/layouts/admin/_header.html.haml +3 -3
  283. data/app/views/layouts/admin/application.html.haml +5 -5
  284. data/app/views/layouts/application.html.haml +3 -3
  285. data/app/views/layouts/header.xls.builder +2 -0
  286. data/app/views/leads/_contact.html.haml +2 -2
  287. data/app/views/leads/_convert.html.haml +2 -2
  288. data/app/views/leads/_convert_permissions.html.haml +10 -10
  289. data/app/views/leads/_edit.html.haml +10 -10
  290. data/app/views/leads/_index_brief.html.haml +6 -6
  291. data/app/views/leads/_index_long.html.haml +7 -7
  292. data/app/views/leads/_lead.html.haml +3 -3
  293. data/app/views/leads/_leads.html.haml +2 -2
  294. data/app/views/leads/_new.html.haml +11 -11
  295. data/app/views/leads/_opportunity.html.haml +6 -6
  296. data/app/views/leads/_sidebar_index.html.haml +5 -5
  297. data/app/views/leads/_sidebar_show.html.haml +13 -13
  298. data/app/views/leads/_status.html.haml +7 -7
  299. data/app/views/leads/_title_bar.html.haml +3 -3
  300. data/app/views/leads/_top_section.html.haml +8 -8
  301. data/app/views/leads/convert.js.haml +4 -4
  302. data/app/views/leads/create.js.haml +3 -3
  303. data/app/views/leads/destroy.js.haml +1 -1
  304. data/app/views/leads/edit.js.haml +4 -4
  305. data/app/views/leads/index.js.haml +4 -4
  306. data/app/views/leads/index.xls.builder +3 -1
  307. data/app/views/leads/new.js.haml +1 -1
  308. data/app/views/leads/promote.js.haml +4 -4
  309. data/app/views/leads/reject.js.haml +1 -1
  310. data/app/views/leads/show.html.haml +6 -6
  311. data/app/views/leads/show.js.haml +1 -1
  312. data/app/views/leads/update.js.haml +3 -3
  313. data/app/views/lists/_lists.html.haml +2 -2
  314. data/app/views/lists/_sidebar.html.haml +8 -8
  315. data/app/views/opportunities/_edit.html.haml +7 -7
  316. data/app/views/opportunities/_index_brief.html.haml +4 -4
  317. data/app/views/opportunities/_index_long.html.haml +11 -11
  318. data/app/views/opportunities/_new.html.haml +8 -8
  319. data/app/views/opportunities/_opportunities.html.haml +2 -2
  320. data/app/views/opportunities/_opportunity.html.haml +3 -3
  321. data/app/views/opportunities/_sidebar_index.html.haml +5 -5
  322. data/app/views/opportunities/_sidebar_show.html.haml +12 -12
  323. data/app/views/opportunities/_title_bar.html.haml +2 -2
  324. data/app/views/opportunities/_top_section.html.haml +14 -14
  325. data/app/views/opportunities/contacts.js.haml +2 -2
  326. data/app/views/opportunities/create.js.haml +4 -4
  327. data/app/views/opportunities/destroy.js.haml +2 -2
  328. data/app/views/opportunities/edit.js.haml +4 -4
  329. data/app/views/opportunities/index.js.haml +4 -4
  330. data/app/views/opportunities/index.xls.builder +3 -1
  331. data/app/views/opportunities/new.js.haml +1 -1
  332. data/app/views/opportunities/show.html.haml +7 -7
  333. data/app/views/opportunities/show.js.haml +1 -1
  334. data/app/views/opportunities/update.js.haml +3 -3
  335. data/app/views/passwords/edit.html.haml +2 -2
  336. data/app/views/passwords/new.html.haml +1 -1
  337. data/app/views/shared/_address.html.haml +3 -3
  338. data/app/views/shared/_comment.html.haml +1 -1
  339. data/app/views/shared/_edit_comment.html.haml +5 -5
  340. data/app/views/shared/_empty.html.haml +1 -1
  341. data/app/views/shared/_paginate_with_per_page.html.haml +1 -1
  342. data/app/views/shared/_recent.html.haml +2 -2
  343. data/app/views/shared/_recently.html.haml +1 -1
  344. data/app/views/shared/_search.html.haml +2 -2
  345. data/app/views/shared/_tags.html.haml +2 -2
  346. data/app/views/shared/_tasks.html.haml +5 -5
  347. data/app/views/subscription_mailer/comment_notification.text.erb +2 -2
  348. data/app/views/tasks/_assigned.html.haml +4 -4
  349. data/app/views/tasks/_completed.html.haml +2 -2
  350. data/app/views/tasks/_edit.html.haml +4 -4
  351. data/app/views/tasks/_empty.html.haml +1 -1
  352. data/app/views/tasks/_new.html.haml +3 -3
  353. data/app/views/tasks/_pending.html.haml +7 -7
  354. data/app/views/tasks/_related.html.haml +2 -2
  355. data/app/views/tasks/_selector.html.haml +4 -4
  356. data/app/views/tasks/_sidebar_index.html.haml +7 -7
  357. data/app/views/tasks/_title.html.haml +2 -2
  358. data/app/views/tasks/_top_section.html.haml +9 -9
  359. data/app/views/tasks/complete.js.haml +2 -2
  360. data/app/views/tasks/create.js.haml +6 -6
  361. data/app/views/tasks/edit.js.haml +3 -3
  362. data/app/views/tasks/index.html.haml +4 -4
  363. data/app/views/tasks/index.xls.builder +5 -3
  364. data/app/views/tasks/new.js.haml +1 -1
  365. data/app/views/tasks/update.js.haml +1 -1
  366. data/app/views/users/_avatar.html.haml +5 -5
  367. data/app/views/users/_password.html.haml +3 -3
  368. data/app/views/users/_profile.html.haml +10 -10
  369. data/app/views/users/_user.html.haml +3 -3
  370. data/app/views/users/_user_report.html.haml +2 -2
  371. data/app/views/users/avatar.js.haml +1 -1
  372. data/app/views/users/change_password.js.haml +1 -1
  373. data/app/views/users/edit.js.haml +1 -1
  374. data/app/views/users/new.html.haml +2 -2
  375. data/app/views/users/opportunities_overview.html.haml +2 -2
  376. data/app/views/users/password.js.haml +1 -1
  377. data/app/views/users/show.html.haml +4 -4
  378. data/app/views/users/update.js.haml +4 -2
  379. data/app/views/users/upload_avatar.js.haml +2 -2
  380. data/app/views/versions/_version.html.haml +3 -3
  381. data/app/views/versions/_version_item.html.haml +3 -3
  382. data/app/views/versions/_versions.html.haml +2 -2
  383. data/bin/bundle +2 -0
  384. data/bin/rails +3 -1
  385. data/bin/rake +2 -0
  386. data/config.ru +3 -1
  387. data/config/application.rb +2 -0
  388. data/config/boot.rb +2 -0
  389. data/config/brakeman.ignore +139 -0
  390. data/config/deploy.example.rb +2 -0
  391. data/config/environment.rb +2 -0
  392. data/config/environments/development.rb +2 -0
  393. data/config/environments/production.rb +2 -0
  394. data/config/environments/staging.rb +2 -0
  395. data/config/environments/test.rb +2 -0
  396. data/config/initializers/action_mailer.rb +2 -0
  397. data/config/initializers/assets.rb +3 -1
  398. data/config/initializers/authlogic.rb +2 -0
  399. data/config/initializers/backtrace_silencers.rb +2 -0
  400. data/config/initializers/constants.rb +2 -0
  401. data/config/initializers/cookies_serializer.rb +2 -0
  402. data/config/initializers/custom_field_ransack_translations.rb +2 -0
  403. data/config/initializers/filter_parameter_logging.rb +2 -0
  404. data/config/initializers/gravatar.rb +2 -0
  405. data/config/initializers/inflections.rb +2 -0
  406. data/config/initializers/locale.rb +2 -0
  407. data/config/initializers/mime_types.rb +2 -0
  408. data/config/initializers/paginate_arrays.rb +2 -0
  409. data/config/initializers/paper_trail.rb +2 -0
  410. data/config/initializers/ransack.rb +2 -0
  411. data/config/initializers/relative_url_root.rb +2 -0
  412. data/config/initializers/secret_token.rb +2 -0
  413. data/config/initializers/session_store.rb +2 -0
  414. data/config/initializers/simple_form.rb +2 -0
  415. data/config/initializers/views.rb +3 -2
  416. data/config/initializers/wrap_parameters.rb +2 -0
  417. data/config/locales/fat_free_crm.de.yml +1 -0
  418. data/config/locales/fat_free_crm.en-GB.yml +7 -5
  419. data/config/locales/fat_free_crm.en-US.yml +7 -5
  420. data/config/locales/fat_free_crm.es-CL.yml +2 -1
  421. data/config/locales/fat_free_crm.es.yml +17 -16
  422. data/config/locales/fat_free_crm.fr.yml +1 -0
  423. data/config/locales/fat_free_crm.ja.yml +555 -184
  424. data/config/locales/fat_free_crm.nl.yml +2 -1
  425. data/config/locales/fat_free_crm.pt-BR.yml +1 -0
  426. data/config/locales/fat_free_crm.ru.yml +1 -0
  427. data/config/puma.rb +2 -0
  428. data/config/routes.rb +3 -1
  429. data/custom_plan.rb +2 -0
  430. data/db/demo/accounts.yml +1 -1
  431. data/db/demo/emails.yml +1 -1
  432. data/db/migrate/20100928030598_create_sessions.rb +2 -0
  433. data/db/migrate/20100928030599_create_users.rb +3 -1
  434. data/db/migrate/20100928030600_create_openid_tables.rb +3 -1
  435. data/db/migrate/20100928030601_create_accounts.rb +2 -0
  436. data/db/migrate/20100928030602_create_permissions.rb +4 -2
  437. data/db/migrate/20100928030603_create_settings.rb +2 -0
  438. data/db/migrate/20100928030604_create_preferences.rb +2 -0
  439. data/db/migrate/20100928030605_create_campaigns.rb +3 -1
  440. data/db/migrate/20100928030606_create_leads.rb +3 -1
  441. data/db/migrate/20100928030607_create_contacts.rb +3 -1
  442. data/db/migrate/20100928030608_create_opportunities.rb +3 -1
  443. data/db/migrate/20100928030609_create_account_contacts.rb +2 -0
  444. data/db/migrate/20100928030610_create_account_opportunities.rb +2 -0
  445. data/db/migrate/20100928030611_create_contact_opportunities.rb +2 -0
  446. data/db/migrate/20100928030612_create_tasks.rb +2 -0
  447. data/db/migrate/20100928030613_create_comments.rb +4 -2
  448. data/db/migrate/20100928030614_create_activities.rb +7 -5
  449. data/db/migrate/20100928030615_create_avatars.rb +5 -3
  450. data/db/migrate/20100928030616_rename_remember_token.rb +2 -0
  451. data/db/migrate/20100928030617_drop_openid_tables.rb +3 -1
  452. data/db/migrate/20100928030618_add_admin_to_users.rb +3 -1
  453. data/db/migrate/20100928030619_add_suspended_to_users.rb +2 -0
  454. data/db/migrate/20100928030620_remove_uuid.rb +2 -0
  455. data/db/migrate/20100928030621_add_email_to_accounts.rb +2 -0
  456. data/db/migrate/20100928030622_add_background_info_to_models.rb +2 -0
  457. data/db/migrate/20100928030623_create_addresses.rb +2 -0
  458. data/db/migrate/20100928030624_add_index_on_permissions.rb +2 -0
  459. data/db/migrate/20100928030625_create_emails.rb +11 -9
  460. data/db/migrate/20100928030626_add_state_to_timeline_objects.rb +2 -0
  461. data/db/migrate/20100928030627_acts_as_taggable_on_migration.rb +2 -0
  462. data/db/migrate/20101221123456_add_single_access_token_to_users.rb +2 -0
  463. data/db/migrate/20101221345678_add_rating_and_category_to_accounts.rb +2 -0
  464. data/db/migrate/20110719082054_add_skype_to_contacts_and_leads.rb +2 -0
  465. data/db/migrate/20111101083437_create_fields.rb +2 -0
  466. data/db/migrate/20111101090312_create_field_groups.rb +2 -0
  467. data/db/migrate/20111116091952_add_field_groups_tag_id.rb +2 -0
  468. data/db/migrate/20111117041311_change_fields_collection_to_text.rb +2 -0
  469. data/db/migrate/20111201030535_add_field_groups_klass_name.rb +2 -0
  470. data/db/migrate/20120121054235_create_lists.rb +2 -0
  471. data/db/migrate/20120216031616_create_versions.rb +4 -2
  472. data/db/migrate/20120216042541_is_paranoid_to_paper_trail.rb +2 -0
  473. data/db/migrate/20120220233724_add_versions_object_changes.rb +2 -0
  474. data/db/migrate/20120224073107_remove_default_value_and_clear_settings.rb +2 -0
  475. data/db/migrate/20120309070209_add_versions_related.rb +2 -0
  476. data/db/migrate/20120314080441_add_subscribed_users_to_entities.rb +2 -0
  477. data/db/migrate/20120316045804_activities_to_versions.rb +13 -12
  478. data/db/migrate/20120405080727_change_subscribed_users_to_set.rb +2 -0
  479. data/db/migrate/20120405080742_change_further_subscribed_users_to_set.rb +2 -0
  480. data/db/migrate/20120406082136_create_groups.rb +2 -0
  481. data/db/migrate/20120413034923_add_index_on_versions_item_type.rb +2 -0
  482. data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +5 -4
  483. data/db/migrate/20120528102124_increase_length_of_version_events.rb +2 -0
  484. data/db/migrate/20120801032706_add_pair_id_to_fields.rb +2 -0
  485. data/db/migrate/20121003063155_add_settings_to_custom_fields.rb +2 -0
  486. data/db/migrate/20121221033947_fix_country_mapping.rb +2 -0
  487. data/db/migrate/20131207033244_add_user_id_to_lists.rb +2 -0
  488. data/db/migrate/20140916011927_add_created_at_index_on_versions.rb +2 -0
  489. data/db/migrate/20140916012922_add_indexes_to_model_associations.rb +2 -0
  490. data/db/migrate/20141126031837_increase_email_to254_chars.rb +2 -0
  491. data/db/migrate/20141230021159_add_transaction_id_column_to_versions.rb +2 -0
  492. data/db/migrate/20141230205453_add_missing_unique_indices.acts_as_taggable_on_engine.rb +2 -0
  493. data/db/migrate/20141230205454_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +2 -0
  494. data/db/migrate/20141230205455_add_missing_taggable_index.acts_as_taggable_on_engine.rb +2 -0
  495. data/db/migrate/20150123060900_convert_radio_to_radio_buttons.rb +2 -0
  496. data/db/migrate/20150227123054_remove_last_request_at_from_users.rb +2 -0
  497. data/db/migrate/20150427131956_create_index_related_type.rb +2 -0
  498. data/db/migrate/20160511053730_add_account_contacts_index.rb +2 -0
  499. data/db/migrate/20180102075234_add_account_counter_caches.rb +24 -0
  500. data/db/migrate/20180103223438_add_minlength_to_field.rb +7 -0
  501. data/db/schema.rb +300 -316
  502. data/db/seeds.rb +1 -0
  503. data/db/seeds/fields.rb +2 -0
  504. data/fat_free_crm.gemspec +4 -4
  505. data/lib/development_tasks/gem.rake +2 -0
  506. data/lib/development_tasks/license.rake +2 -0
  507. data/lib/development_tasks/rdoc.rake +2 -0
  508. data/lib/development_tasks/rspec.rake +2 -0
  509. data/lib/fat_free_crm.rb +2 -0
  510. data/lib/fat_free_crm/callback.rb +2 -0
  511. data/lib/fat_free_crm/comment_extensions.rb +2 -0
  512. data/lib/fat_free_crm/core_ext.rb +2 -0
  513. data/lib/fat_free_crm/core_ext/alias_method_chain.rb +7 -6
  514. data/lib/fat_free_crm/core_ext/nil.rb +2 -0
  515. data/lib/fat_free_crm/core_ext/string.rb +4 -2
  516. data/lib/fat_free_crm/custom_fields.rb +2 -0
  517. data/lib/fat_free_crm/engine.rb +2 -0
  518. data/lib/fat_free_crm/errors.rb +2 -0
  519. data/lib/fat_free_crm/exceptions.rb +2 -0
  520. data/lib/fat_free_crm/export_csv.rb +3 -1
  521. data/lib/fat_free_crm/exportable.rb +2 -0
  522. data/lib/fat_free_crm/fields.rb +2 -0
  523. data/lib/fat_free_crm/gem_dependencies.rb +2 -0
  524. data/lib/fat_free_crm/gem_ext.rb +2 -0
  525. data/lib/fat_free_crm/gem_ext/action_controller/base.rb +2 -0
  526. data/lib/fat_free_crm/gem_ext/active_support/buffered_logger.rb +4 -2
  527. data/lib/fat_free_crm/gem_ext/rails/engine.rb +9 -8
  528. data/lib/fat_free_crm/gem_ext/rake/task.rb +2 -0
  529. data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +2 -0
  530. data/lib/fat_free_crm/i18n.rb +2 -0
  531. data/lib/fat_free_crm/load_settings.rb +2 -0
  532. data/lib/fat_free_crm/mail_processor/base.rb +11 -8
  533. data/lib/fat_free_crm/mail_processor/comment_replies.rb +2 -0
  534. data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -3
  535. data/lib/fat_free_crm/permissions.rb +8 -9
  536. data/lib/fat_free_crm/renderers.rb +2 -0
  537. data/lib/fat_free_crm/secret_token_generator.rb +2 -0
  538. data/lib/fat_free_crm/sortable.rb +2 -0
  539. data/lib/fat_free_crm/tabs.rb +2 -0
  540. data/lib/fat_free_crm/version.rb +4 -2
  541. data/lib/fat_free_crm/view_factory.rb +3 -1
  542. data/lib/gravatar_image_tag.rb +2 -0
  543. data/lib/missing_translation_detector.rb +2 -0
  544. data/lib/tasks/ffcrm/comment_replies.rake +2 -0
  545. data/lib/tasks/ffcrm/config.rake +2 -0
  546. data/lib/tasks/ffcrm/demo.rake +3 -1
  547. data/lib/tasks/ffcrm/dropbox.rake +2 -0
  548. data/lib/tasks/ffcrm/missing_translations.rake +8 -7
  549. data/lib/tasks/ffcrm/secret.rake +2 -0
  550. data/lib/tasks/ffcrm/settings.rake +2 -0
  551. data/lib/tasks/ffcrm/setup.rake +2 -0
  552. data/lib/tasks/ffcrm/update_data.rake +98 -96
  553. data/script/rails +4 -2
  554. data/spec/controllers/admin/groups_controller_spec.rb +2 -0
  555. data/spec/controllers/admin/users_controller_spec.rb +3 -1
  556. data/spec/controllers/applications_controller_spec.rb +2 -0
  557. data/spec/controllers/authentications_controller_spec.rb +2 -0
  558. data/spec/controllers/comments_controller_spec.rb +3 -1
  559. data/spec/controllers/emails_controller_spec.rb +3 -1
  560. data/spec/controllers/entities/accounts_controller_spec.rb +4 -2
  561. data/spec/controllers/entities/campaigns_controller_spec.rb +4 -2
  562. data/spec/controllers/entities/contacts_controller_spec.rb +4 -2
  563. data/spec/controllers/entities/leads_controller_spec.rb +4 -2
  564. data/spec/controllers/entities/opportunities_controller_spec.rb +4 -2
  565. data/spec/controllers/entities_controller_spec.rb +2 -0
  566. data/spec/controllers/home_controller_spec.rb +14 -10
  567. data/spec/controllers/lists_controller_spec.rb +2 -0
  568. data/spec/controllers/passwords_controller_spec.rb +2 -0
  569. data/spec/controllers/tasks_controller_spec.rb +3 -1
  570. data/spec/controllers/users_controller_spec.rb +20 -18
  571. data/spec/factories/account_factories.rb +2 -0
  572. data/spec/factories/campaign_factories.rb +2 -0
  573. data/spec/factories/contact_factories.rb +2 -0
  574. data/spec/factories/field_factories.rb +2 -0
  575. data/spec/factories/lead_factories.rb +2 -0
  576. data/spec/factories/list_factories.rb +2 -0
  577. data/spec/factories/opportunity_factories.rb +2 -0
  578. data/spec/factories/sequences.rb +4 -2
  579. data/spec/factories/setting_factories.rb +2 -0
  580. data/spec/factories/shared_factories.rb +3 -1
  581. data/spec/factories/subscription_factories.rb +2 -0
  582. data/spec/factories/tag_factories.rb +2 -0
  583. data/spec/factories/task_factories.rb +2 -0
  584. data/spec/factories/user_factories.rb +3 -1
  585. data/spec/features/acceptance_helper.rb +2 -0
  586. data/spec/features/accounts_spec.rb +5 -1
  587. data/spec/features/admin/groups_spec.rb +4 -3
  588. data/spec/features/admin/users_spec.rb +4 -3
  589. data/spec/features/campaigns_spec.rb +2 -1
  590. data/spec/features/contacts_spec.rb +3 -1
  591. data/spec/features/dashboard_spec.rb +2 -1
  592. data/spec/features/leads_spec.rb +7 -2
  593. data/spec/features/opportunities_overview_spec.rb +2 -1
  594. data/spec/features/opportunities_spec.rb +3 -2
  595. data/spec/features/support/browser.rb +2 -0
  596. data/spec/features/support/headless.rb +2 -0
  597. data/spec/features/support/helpers.rb +2 -0
  598. data/spec/features/support/maintain_sessions.rb +2 -0
  599. data/spec/features/support/paths.rb +2 -0
  600. data/spec/features/support/selector_helpers.rb +2 -6
  601. data/spec/features/tasks_spec.rb +8 -7
  602. data/spec/helpers/accounts_helper_spec.rb +2 -0
  603. data/spec/helpers/admin/field_groups_helper_spec.rb +2 -0
  604. data/spec/helpers/admin/plugins_helper_spec.rb +2 -0
  605. data/spec/helpers/admin/settings_helper_spec.rb +2 -0
  606. data/spec/helpers/admin/users_helper_spec.rb +2 -0
  607. data/spec/helpers/application_helper_spec.rb +6 -3
  608. data/spec/helpers/authentications_helper_spec.rb +2 -0
  609. data/spec/helpers/campaigns_helper_spec.rb +2 -0
  610. data/spec/helpers/comments_helper_spec.rb +2 -0
  611. data/spec/helpers/contacts_helper_spec.rb +2 -0
  612. data/spec/helpers/emails_helper_spec.rb +2 -0
  613. data/spec/helpers/fields_helper_spec.rb +2 -0
  614. data/spec/helpers/groups_helper_spec.rb +2 -0
  615. data/spec/helpers/home_helper_spec.rb +2 -0
  616. data/spec/helpers/leads_helper_spec.rb +2 -0
  617. data/spec/helpers/lists_helper_spec.rb +2 -0
  618. data/spec/helpers/opportunities_helper_spec.rb +2 -0
  619. data/spec/helpers/passwords_helper_spec.rb +2 -0
  620. data/spec/helpers/tasks_helper_spec.rb +2 -0
  621. data/spec/helpers/users_helper_spec.rb +2 -0
  622. data/spec/lib/comment_extensions_spec.rb +2 -0
  623. data/spec/lib/core_ext/string_spec.rb +2 -0
  624. data/spec/lib/errors_spec.rb +2 -0
  625. data/spec/lib/fields_spec.rb +2 -0
  626. data/spec/lib/mail_processor/base_spec.rb +2 -0
  627. data/spec/lib/mail_processor/comment_replies_spec.rb +2 -0
  628. data/spec/lib/mail_processor/dropbox_spec.rb +2 -0
  629. data/spec/lib/mail_processor/sample_emails/dropbox.rb +166 -164
  630. data/spec/lib/permissions_spec.rb +2 -0
  631. data/spec/lib/secret_token_generator_spec.rb +2 -0
  632. data/spec/lib/view_factory_spec.rb +2 -0
  633. data/spec/mailers/subscription_mailer_spec.rb +15 -16
  634. data/spec/mailers/user_mailer_spec.rb +2 -0
  635. data/spec/models/entities/account_contact_spec.rb +3 -0
  636. data/spec/models/entities/account_opportunity_spec.rb +3 -0
  637. data/spec/models/entities/account_spec.rb +3 -1
  638. data/spec/models/entities/campaign_spec.rb +3 -1
  639. data/spec/models/entities/contact_opportunity_spec.rb +2 -0
  640. data/spec/models/entities/contact_spec.rb +35 -21
  641. data/spec/models/entities/lead_spec.rb +3 -1
  642. data/spec/models/entities/opportunity_spec.rb +39 -27
  643. data/spec/models/fields/custom_field_date_pair_spec.rb +2 -0
  644. data/spec/models/fields/custom_field_pair_spec.rb +2 -0
  645. data/spec/models/fields/custom_field_spec.rb +2 -0
  646. data/spec/models/fields/field_group_spec.rb +2 -0
  647. data/spec/models/fields/field_spec.rb +8 -4
  648. data/spec/models/list_spec.rb +2 -0
  649. data/spec/models/observers/entity_observer_spec.rb +2 -0
  650. data/spec/models/polymorphic/address_spec.rb +2 -4
  651. data/spec/models/polymorphic/avatar_spec.rb +2 -0
  652. data/spec/models/polymorphic/comment_spec.rb +2 -4
  653. data/spec/models/polymorphic/email_spec.rb +2 -0
  654. data/spec/models/polymorphic/task_spec.rb +6 -4
  655. data/spec/models/polymorphic/version_spec.rb +7 -10
  656. data/spec/models/setting_spec.rb +23 -0
  657. data/spec/models/users/abilities/user_ability_spec.rb +2 -0
  658. data/spec/models/users/authentication_spec.rb +2 -0
  659. data/spec/models/users/group_spec.rb +2 -0
  660. data/spec/models/users/permission_spec.rb +2 -0
  661. data/spec/models/users/preference_spec.rb +2 -0
  662. data/spec/models/users/user_spec.rb +11 -17
  663. data/spec/routing/accounts_routing_spec.rb +2 -0
  664. data/spec/routing/admin/users_routing_spec.rb +2 -0
  665. data/spec/routing/campaigns_routing_spec.rb +2 -0
  666. data/spec/routing/comments_routing_spec.rb +2 -0
  667. data/spec/routing/contacts_routing_spec.rb +2 -0
  668. data/spec/routing/emails_routing_spec.rb +2 -0
  669. data/spec/routing/leads_routing_spec.rb +2 -0
  670. data/spec/routing/opportunities_routing_spec.rb +2 -0
  671. data/spec/routing/tasks_routing_spec.rb +2 -0
  672. data/spec/routing/users_routing_spec.rb +2 -0
  673. data/spec/shared/controllers.rb +2 -0
  674. data/spec/shared/models.rb +2 -0
  675. data/spec/spec_helper.rb +7 -5
  676. data/spec/support/assert_select.rb +2 -0
  677. data/spec/support/auth_macros.rb +5 -12
  678. data/spec/support/macros.rb +9 -7
  679. data/spec/support/mail_processor_mocks.rb +2 -0
  680. data/spec/support/uploaded_file.rb +2 -0
  681. data/spec/views/accounts/_edit.haml_spec.rb +4 -3
  682. data/spec/views/accounts/_new.haml_spec.rb +3 -1
  683. data/spec/views/accounts/create.js.haml_spec.rb +3 -1
  684. data/spec/views/accounts/destroy.js.haml_spec.rb +3 -1
  685. data/spec/views/accounts/edit.js.haml_spec.rb +3 -1
  686. data/spec/views/accounts/index.haml_spec.rb +3 -1
  687. data/spec/views/accounts/index.js.haml_spec.rb +3 -1
  688. data/spec/views/accounts/new.js.haml_spec.rb +3 -1
  689. data/spec/views/accounts/show.haml_spec.rb +6 -1
  690. data/spec/views/accounts/update.js.haml_spec.rb +3 -1
  691. data/spec/views/admin/field_groups/create.js.haml_spec.rb +3 -1
  692. data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +3 -1
  693. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +3 -1
  694. data/spec/views/admin/field_groups/new.js.haml_spec.rb +3 -1
  695. data/spec/views/admin/field_groups/update.js.haml_spec.rb +3 -1
  696. data/spec/views/admin/users/_create.haml_spec.rb +3 -1
  697. data/spec/views/admin/users/create.js.haml_spec.rb +3 -1
  698. data/spec/views/admin/users/destroy.js.haml_spec.rb +3 -1
  699. data/spec/views/admin/users/edit.js.haml_spec.rb +3 -1
  700. data/spec/views/admin/users/index.haml_spec.rb +3 -1
  701. data/spec/views/admin/users/index.js.haml_spec.rb +3 -1
  702. data/spec/views/admin/users/new.js.haml_spec.rb +3 -1
  703. data/spec/views/admin/users/reactivate.js.haml_spec.rb +3 -1
  704. data/spec/views/admin/users/show.haml_spec.rb +2 -0
  705. data/spec/views/admin/users/suspend.js.haml_spec.rb +3 -1
  706. data/spec/views/admin/users/update.js.haml_spec.rb +3 -1
  707. data/spec/views/application/auto_complete.haml_spec.rb +3 -1
  708. data/spec/views/authentications/new.haml_spec.rb +2 -0
  709. data/spec/views/campaigns/_edit.haml_spec.rb +3 -1
  710. data/spec/views/campaigns/_new.haml_spec.rb +3 -1
  711. data/spec/views/campaigns/create.js.haml_spec.rb +3 -1
  712. data/spec/views/campaigns/destroy.js.haml_spec.rb +3 -1
  713. data/spec/views/campaigns/edit.js.haml_spec.rb +3 -1
  714. data/spec/views/campaigns/index.haml_spec.rb +3 -1
  715. data/spec/views/campaigns/index.js.haml_spec.rb +3 -1
  716. data/spec/views/campaigns/new.js.haml_spec.rb +3 -1
  717. data/spec/views/campaigns/show.haml_spec.rb +6 -1
  718. data/spec/views/campaigns/update.js.haml_spec.rb +3 -1
  719. data/spec/views/comments/edit.js.haml_spec.rb +5 -4
  720. data/spec/views/contacts/_edit.haml_spec.rb +3 -1
  721. data/spec/views/contacts/_new.haml_spec.rb +3 -1
  722. data/spec/views/contacts/create.js.haml_spec.rb +3 -1
  723. data/spec/views/contacts/destroy.js.haml_spec.rb +3 -1
  724. data/spec/views/contacts/edit.js.haml_spec.rb +3 -1
  725. data/spec/views/contacts/index.haml_spec.rb +3 -1
  726. data/spec/views/contacts/index.js.html_spec.rb +3 -1
  727. data/spec/views/contacts/new.js.haml_spec.rb +3 -1
  728. data/spec/views/contacts/show.haml_spec.rb +6 -1
  729. data/spec/views/contacts/update.js.haml_spec.rb +3 -1
  730. data/spec/views/home/index.haml_spec.rb +3 -1
  731. data/spec/views/home/index.js.haml_spec.rb +3 -1
  732. data/spec/views/home/options.js.haml_spec.rb +4 -2
  733. data/spec/views/leads/_convert.haml_spec.rb +3 -1
  734. data/spec/views/leads/_edit.haml_spec.rb +3 -1
  735. data/spec/views/leads/_new.haml_spec.rb +3 -1
  736. data/spec/views/leads/_sidebar_show.haml_spec.rb +3 -1
  737. data/spec/views/leads/convert.js.haml_spec.rb +3 -1
  738. data/spec/views/leads/create.js.haml_spec.rb +3 -1
  739. data/spec/views/leads/destroy.js.haml_spec.rb +3 -1
  740. data/spec/views/leads/edit.js.haml_spec.rb +3 -1
  741. data/spec/views/leads/index.haml_spec.rb +3 -1
  742. data/spec/views/leads/index.js.haml_spec.rb +3 -1
  743. data/spec/views/leads/new.js.haml_spec.rb +3 -1
  744. data/spec/views/leads/promote.js.haml_spec.rb +3 -1
  745. data/spec/views/leads/reject.js.haml_spec.rb +3 -1
  746. data/spec/views/leads/show.haml_spec.rb +6 -1
  747. data/spec/views/leads/update.js.haml_spec.rb +3 -1
  748. data/spec/views/opportunities/_edit.haml_spec.rb +3 -1
  749. data/spec/views/opportunities/_new.haml_spec.rb +3 -1
  750. data/spec/views/opportunities/create.js.haml_spec.rb +3 -1
  751. data/spec/views/opportunities/destroy.js.haml_spec.rb +3 -1
  752. data/spec/views/opportunities/edit.js.haml_spec.rb +3 -1
  753. data/spec/views/opportunities/index.haml_spec.rb +3 -1
  754. data/spec/views/opportunities/index.js.haml_spec.rb +3 -1
  755. data/spec/views/opportunities/new.js.haml_spec.rb +3 -1
  756. data/spec/views/opportunities/show.haml_spec.rb +6 -1
  757. data/spec/views/opportunities/update.js.haml_spec.rb +3 -1
  758. data/spec/views/tasks/_edit.haml_spec.rb +3 -1
  759. data/spec/views/tasks/complete.js.haml_spec.rb +3 -1
  760. data/spec/views/tasks/create.js.haml_spec.rb +3 -1
  761. data/spec/views/tasks/destroy.js.haml_spec.rb +3 -1
  762. data/spec/views/tasks/edit.js.haml_spec.rb +3 -1
  763. data/spec/views/tasks/index.haml_spec.rb +6 -4
  764. data/spec/views/tasks/new.js.haml_spec.rb +3 -1
  765. data/spec/views/tasks/uncomplete.js.haml_spec.rb +3 -1
  766. data/spec/views/tasks/update.js.haml_spec.rb +3 -1
  767. data/spec/views/users/avatar.js.haml_spec.rb +3 -1
  768. data/spec/views/users/change_password.js.haml_spec.rb +3 -1
  769. data/spec/views/users/edit.js.haml_spec.rb +3 -1
  770. data/spec/views/users/password.js.haml_spec.rb +3 -1
  771. data/spec/views/users/update.js.haml_spec.rb +3 -1
  772. data/spec/views/users/upload_avatar.js.haml_spec.rb +4 -2
  773. data/vendor/assets/javascripts/textarea_autocomplete.js +1 -1
  774. data/vendor/gems/globby-0.1.2/lib/globby/glob.rb +1 -1
  775. metadata +8 -12
  776. data/app/assets/javascripts/crm_chosen.js.coffee +0 -29
  777. data/app/assets/stylesheets/ffcrm_chosen.scss +0 -69
  778. data/vendor/assets/javascripts/ajax-chosen-jquery.js +0 -2
  779. data/vendor/assets/javascripts/ajax-chosen.jquery.coffee +0 -171
  780. data/vendor/assets/javascripts/chosen-jquery.js +0 -3
  781. data/vendor/assets/javascripts/chosen.jquery.coffee +0 -574
  782. data/vendor/assets/javascripts/lib/abstract-chosen.coffee +0 -110
  783. data/vendor/assets/stylesheets/chosen.css.sass +0 -361
@@ -2,10 +2,10 @@
2
2
  - sort_by_menu_items = model.sort_by_fields.map { |field| options_menu_item(:sort_by, field) }
3
3
  - current_sort_by = t("option_" + model.sort_by_map.invert[@sort_by])
4
4
 
5
- %div{ :style => "margin: 0px 0px 6px 0px" }
6
- = text_field_tag('query', @current_query, :size => 32, :autofocus => true, :placeholder => "Search #{controller_name}")
5
+ %div{ style: "margin: 0px 0px 6px 0px" }
6
+ = text_field_tag('query', @current_query, size: 32, autofocus: true, placeholder: "Search #{controller_name}")
7
7
  %span.sorting_options
8
- = t(:sort_by, :field => link_to(h(current_sort_by), "#", :id => :sort_by)).html_safe
8
+ = t(:sort_by, field: link_to(h(current_sort_by), "#", id: :sort_by)).html_safe
9
9
 
10
10
  :javascript
11
11
  var searchTimeout;
@@ -7,14 +7,14 @@
7
7
  = get_default_permissions_intro(entity.access, t("#{model}_small")) unless edit
8
8
  #entity_permissions{ hidden_if(collapsed) }
9
9
  .radio_box
10
- = f.radio_button :access, "Private", :onclick => "$('#people').hide()"
11
- = f.label :access_private, t(:keep_private), :style => "cursor:pointer"
10
+ = f.radio_button :access, "Private", onclick: "$('#people').hide()"
11
+ = f.label :access_private, t(:keep_private), style: "cursor:pointer"
12
12
  .radio_box
13
- = f.radio_button :access, "Public", :onclick => "$('#people').hide()"
14
- = f.label :access_public, t(:make_public), :style => "cursor:pointer"
13
+ = f.radio_button :access, "Public", onclick: "$('#people').hide()"
14
+ = f.label :access_public, t(:make_public), style: "cursor:pointer"
15
15
  .radio_box
16
- = f.radio_button :access, "Shared", :onclick => "$('#people').show()"
17
- = f.label :access_shared, t(:share_with), :style => "cursor:pointer"
16
+ = f.radio_button :access, "Shared", onclick: "$('#people').show()"
17
+ = f.label :access_shared, t(:share_with), style: "cursor:pointer"
18
18
 
19
19
  #people{ hidden_if(entity.access != "Shared") }
20
20
  %table
@@ -22,15 +22,15 @@
22
22
  %td
23
23
  = f.label :user_ids, "#{t(:users)}:"
24
24
  %br
25
- = f.select :user_ids, user_options, {}, :multiple => true, :class => 'select2'
25
+ = f.select :user_ids, user_options, {}, multiple: true, class: 'select2'
26
26
  %tr
27
27
  %td
28
28
  = f.label :group_ids, "#{t(:groups)}:"
29
29
  %br
30
- = f.select :group_ids, group_options, {}, :multiple => true, :class => 'select2'
30
+ = f.select :group_ids, group_options, {}, multiple: true, class: 'select2'
31
31
 
32
32
  - if !edit and entity.is_a?(Lead)
33
33
  .radio_box
34
- = f.radio_button :access, t(:campaign), :onclick => "$('#people').hide(); $('#lead_access_campaign').val('Campaign');", :disabled => true
35
- %font{ :id => :copy_permissions, :color => :grey }
34
+ = f.radio_button :access, t(:campaign), onclick: "$('#people').hide(); $('#lead_access_campaign').val('Campaign');", disabled: true
35
+ %font{ id: :copy_permissions, color: :grey }
36
36
  = t(:copy_permissions, t(:campaign_small))
@@ -2,15 +2,15 @@
2
2
  .tabs
3
3
  %ul
4
4
  %li
5
- = link_to t('basic_search'), '#', :"data-search-form" => "basic_search", :class => (params[:q] ? "" : " active")
5
+ = link_to t('basic_search'), '#', :"data-search-form" => "basic_search", class: (params[:q] ? "" : " active")
6
6
  %li
7
- = link_to t('advanced_search'), '#', :"data-search-form" => "advanced_search", :class => (!params[:q] ? "" : " active")
7
+ = link_to t('advanced_search'), '#', :"data-search-form" => "advanced_search", class: (!params[:q] ? "" : " active")
8
8
 
9
9
  #search_results_count
10
- = t('search_results_count', :count => @search_results_count)
10
+ = t('search_results_count', count: @search_results_count)
11
11
 
12
- .search_form#basic_search{ :style => (params[:q] ? 'display: none;' : '') }
12
+ .search_form#basic_search{ style: (params[:q] ? 'display: none;' : '') }
13
13
  = render "basic_search"
14
14
 
15
- .search_form#advanced_search{ :style => (!params[:q] ? 'display: none;' : '') }
16
- = ransack_ui_search :remote => true
15
+ .search_form#advanced_search{ style: (!params[:q] ? 'display: none;' : '') }
16
+ = ransack_ui_search remote: true
@@ -5,7 +5,7 @@
5
5
  -# add a new section
6
6
  %div[field_group]
7
7
  - collapsed = session[dom_id(field_group, entity_show)].nil?
8
- = section_title dom_id(field_group, entity_show), collapsed, field_group.label_i18n, t('show_tag_info_small', :tag => field_group.label_i18n)
8
+ = section_title dom_id(field_group, entity_show), collapsed, field_group.label_i18n, t('show_tag_info_small', tag: field_group.label_i18n)
9
9
  .show_fields
10
- %div{ hidden_if(collapsed).merge(:id => dom_id(field_group, entity_show)) }
11
- = render "fields/group_view", :fields => fields, :entity => entity
10
+ %div{ hidden_if(collapsed).merge(id: dom_id(field_group, entity_show)) }
11
+ = render "fields/group_view", fields: fields, entity: entity
@@ -5,8 +5,8 @@
5
5
  #buttons
6
6
  = view_buttons
7
7
  .create_asset
8
- = link_to_inline("create_#{model_name}".to_sym, send("new_#{model_name}_path"), :text => t("create_#{model_name}".to_sym))
8
+ = link_to_inline("create_#{model_name}".to_sym, send("new_#{model_name}_path"), text: t("create_#{model_name}".to_sym))
9
9
 
10
10
  .title
11
- %span{:id => "create_#{model_name}_title"} #{t controller_name.to_sym}
12
- = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
11
+ %span{id: "create_#{model_name}_title"} #{t controller_name.to_sym}
12
+ = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
@@ -8,11 +8,11 @@
8
8
  - view = "pending"
9
9
  - else
10
10
  - view = "assigned"
11
- $('#tasks').prepend('#{ j render(:partial => "tasks/#{view}", :collection => [ @attachment ], :locals => { :bucket => @attachment.computed_bucket }) }');
11
+ $('#tasks').prepend('#{ j render(partial: "tasks/#{view}", collection: [ @attachment ], locals: { bucket: @attachment.computed_bucket }) }');
12
12
 
13
13
 
14
14
  - else
15
- $('##{h params[:assets]}').prepend('#{ j render(:partial => "#{params[:assets]}/#{partial}", :collection => [ @attachment ]) }');
15
+ $('##{h params[:assets]}').prepend('#{ j render(partial: "#{params[:assets]}/#{partial}", collection: [ @attachment ]) }');
16
16
  - if called_from_landing_page?(:accounts)
17
17
  = refresh_sidebar_for(:accounts, :show, :summary)
18
18
  - elsif called_from_landing_page?(:campaigns)
@@ -1,3 +1,3 @@
1
- - contacts = entity.contacts.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
2
- $('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => contacts) }');
1
+ - contacts = entity.contacts.order('updated_at DESC').paginate(page: params[:page], per_page: 20)
2
+ $('#contacts').html('#{ j render(partial: 'contacts/contact', collection: contacts) }');
3
3
  $('#contacts_pagination').html('#{ j paginate(collection: contacts, container: false, params: { action: 'contacts' } ) }');
@@ -1,3 +1,3 @@
1
- - leads = entity.leads.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
2
- $('#leads').html('#{ j render(:partial => 'leads/lead', :collection => leads) }');
1
+ - leads = entity.leads.order('updated_at DESC').paginate(page: params[:page], per_page: 20)
2
+ $('#leads').html('#{ j render(partial: 'leads/lead', collection: leads) }');
3
3
  $('#leads_pagination').html('#{ j paginate(collection: leads, container: false, params: { action: 'leads' } ) }');
@@ -1,3 +1,3 @@
1
- - opportunities = entity.opportunities.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
2
- $('#opportunities').html('#{ j render(:partial => 'opportunities/opportunity', :collection => opportunities) }');
1
+ - opportunities = entity.opportunities.order('updated_at DESC').paginate(page: params[:page], per_page: 20)
2
+ $('#opportunities').html('#{ j render(partial: 'opportunities/opportunity', collection: opportunities) }');
3
3
  $('#opportunities_pagination').html('#{ j paginate(collection: opportunities, container: false, params: { action: 'opportunities' } ) }');
@@ -1,4 +1,4 @@
1
1
  - class_name = entity.class.name.underscore
2
2
  - id = "#{class_name}_#{entity.id}_subscribe"
3
3
 
4
- $('##{id}').html('#{ j render(:partial => "comments/subscription_links", :locals => {:entity => entity}) }');
4
+ $('##{id}').html('#{ j render(partial: "comments/subscription_links", locals: {entity: entity}) }');
@@ -1,3 +1,3 @@
1
- - versions = Version.history(entity).paginate(:page => params[:page], :per_page => 20)
2
- $('#versions .list').html('#{ j(render :partial => 'versions/version', :collection => versions) }')
1
+ - versions = Version.history(entity).paginate(page: params[:page], per_page: 20)
2
+ $('#versions .list').html('#{ j(render partial: 'versions/version', collection: versions) }')
3
3
  $('#versions_pagination').html('#{ j paginate(collection: versions, container: false, params: { action: 'versions' } ) }')
@@ -1,8 +1,8 @@
1
1
 
2
- = hook(:custom_field_top_section, self, :f => f) do
2
+ = hook(:custom_field_top_section, self, f: f) do
3
3
  -# produce inputs for custom fields that do not belong to a particular field group
4
4
  -# i.e. they belong to the 'custom_fields' group
5
5
  - f.object.field_groups.select{|fg| fg.name == 'custom_fields'}.each do |field_group|
6
6
  - if field_group.fields.present?
7
7
  - field_groups[field_group.tag.name.downcase] = "#{field_group.key}_container" if field_group.tag
8
- = render :partial => 'fields/group', :locals => {:f => f, :field_group => field_group}
8
+ = render partial: 'fields/group', locals: {f: f, field_group: field_group}
@@ -1,11 +1,11 @@
1
1
  - if field_group.name != 'custom_fields'
2
2
  -# start a new section
3
3
  - collapsed = session[field_group.key].nil?
4
- %div{ :id => "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) }
5
- = subtitle field_group.key, collapsed, t(field_group.name, :default => field_group.label)
4
+ %div{ id: "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) }
5
+ = subtitle field_group.key, collapsed, t(field_group.name, default: field_group.label)
6
6
  .section
7
- %small{ hidden_if(!collapsed).merge(:id => "#{field_group.key}_intro") }
7
+ %small{ hidden_if(!collapsed).merge(id: "#{field_group.key}_intro") }
8
8
  %div[field_group]{ hidden_if(collapsed) }
9
- = render :partial => 'fields/group_table', :locals => {:f => f, :field_group => field_group}
9
+ = render partial: 'fields/group_table', locals: {f: f, field_group: field_group}
10
10
  - else
11
- .section= render :partial => 'fields/group_table', :locals => {:f => f, :field_group => field_group}
11
+ .section= render partial: 'fields/group_table', locals: {f: f, field_group: field_group}
@@ -4,10 +4,10 @@
4
4
  - group.each_with_index do |field, i|
5
5
  %td
6
6
  - if field.hint.present?
7
- = image_tag "info_tiny.png", :title => field.hint, :class => "tooltip-icon"
7
+ = image_tag "info_tiny.png", title: field.hint, class: "tooltip-icon"
8
8
  - if field.as == 'check_boxes'
9
9
  - value = f.object.send(field.name)
10
10
  - checked = YAML.load(value.to_s)
11
- = f.input field.name, field.input_options.merge(:checked => checked)
11
+ = f.input field.name, field.input_options.merge(checked: checked)
12
12
  - if i == 0
13
13
  %td= spacer
@@ -5,4 +5,4 @@
5
5
  - f.object.field_groups.each do |field_group|
6
6
  - if field_group.fields.present? and field_group.name != 'custom_fields'
7
7
  - field_groups[field_group.tag.name.downcase] = "#{field_group.key}_container" if field_group.tag
8
- = render :partial => 'fields/group', :locals => {:f => f, :field_group => field_group}
8
+ = render partial: 'fields/group', locals: {f: f, field_group: field_group}
@@ -6,4 +6,4 @@
6
6
  .caption #{field_group.label_i18n}
7
7
  - fg.each do |field|
8
8
  - if (value = field.render_value(asset)).present?
9
- == #{field.label}:<br /> <b>#{truncate(value, :length => 35)}</b><br />
9
+ == #{field.label}:<br /> <b>#{truncate(value, length: 35)}</b><br />
@@ -1,3 +1,3 @@
1
1
  <%= simple_fields_for(@asset) do |f| %>
2
- $('#field_groups').append('<%= j render(:partial => 'fields/group', :locals => {:f => f, :field_group => @field_group, :fields => @field_group.fields}) %>')
2
+ $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: @field_group, fields: @field_group.fields}) %>')
3
3
  <% end %>
@@ -1,29 +1,29 @@
1
1
  - amount = account.opportunities.not_lost.map(&:weighted_amount).sum
2
2
  %li.highlight[account]
3
3
  - if account.category
4
- .strip{:class => account.category} #{t(account.category)}
4
+ .strip{class: account.category} #{t(account.category)}
5
5
  - else
6
- .strip{:style => "color: gray;"} #{t :other}
6
+ .strip{style: "color: gray;"} #{t :other}
7
7
 
8
8
  .indent
9
9
  = link_to(h(account.name), account)
10
10
  &ndash;
11
11
  %tt
12
- = account.location << ", " unless account.location.blank?
12
+ = account.location + ", " unless account.location.blank?
13
13
  - user_name = account.user.try(:full_name)
14
14
  - if user_name
15
- = t(:added_by, :time_ago => timeago(account.created_at), :user => h(user_name)).html_safe
15
+ = t(:added_by, time_ago: timeago(account.created_at), user: h(user_name)).html_safe
16
16
  - else
17
- = t(:added_ago, :value => timeago(account.created_at)).html_safe
17
+ = t(:added_ago, value: timeago(account.created_at)).html_safe
18
18
 
19
19
  - unless current_user.preference[:accounts_index_view] == "accounts_index_brief"
20
20
  %dt
21
- = link_to(account.website, account.website.to_url) << " | " if account.website.present?
22
- = link_to_email(account.email) << " | " if account.email.present?
23
- = t(:phone_small) << ": " << (account.toll_free_phone || account.phone) << " | " if account.toll_free_phone? || account.phone?
24
- = t('pluralize.contact', account.contacts.count) << " | "
25
- = t('pluralize.opportunity', account.opportunities.count)
21
+ = link_to(account.website, account.website.to_url) + " | " if account.website.present?
22
+ = link_to_email(account.email) + " | " if account.email.present?
23
+ = t(:phone_small) + ": " + (account.toll_free_phone || account.phone) << " | " if account.toll_free_phone? || account.phone?
24
+ = t('pluralize.contact', account.contacts_count) + " | "
25
+ = t('pluralize.opportunity', account.opportunities_count)
26
26
  - if account.tags.present?
27
27
  %dt
28
28
  .tags= tags_for_dashboard(account)
29
- = hook(:account_bottom, self, :account => account)
29
+ = hook(:account_bottom, self, account: account)
@@ -8,27 +8,27 @@
8
8
  - link_to item.name, polymorphic_url(item)
9
9
 
10
10
  - elsif item.respond_to?(:name)
11
- - content_tag :span, item.name, :style => "color:black;" # Individual tasks have no landing pages where we could link to.
11
+ - content_tag :span, item.name, style: "color:black;" # Individual tasks have no landing pages where we could link to.
12
12
 
13
- - known_event = t('action_' + activity.event, :default => 0) != 0
13
+ - known_event = t('action_' + activity.event, default: 0) != 0
14
14
 
15
15
  - if (user.present? && subject.present?) || !known_event
16
16
  %li[activity]
17
17
  .tools
18
18
  %small
19
- = l(activity.created_at, :format => :short)
19
+ = l(activity.created_at, format: :short)
20
20
  %tt
21
21
  - if known_event
22
22
  - action = t('action_' + activity.event)
23
23
  - type = t('subject_' + activity.item_type.downcase)
24
- = link_to avatar_for(activity.user, :size => :thumb), user_path(activity.user)
25
- = t("activity_text", :user => h(user), :action => h(action), :type => h(type), :subject => h(subject), :default => "#{h user} #{h action} #{h type} #{h subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'
24
+ = link_to avatar_for(activity.user, size: :thumb), user_path(activity.user)
25
+ = t("activity_text", user: h(user), action: h(action), type: h(type), subject: h(subject), default: "#{h user} #{h action} #{h type} #{h subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'
26
26
  - if ((item = activity.item).class == Comment) and Setting.comments_visible_on_dashboard
27
- = t('action_create_comment', :comment => truncate(h(item.comment), :length => 90)).html_safe
27
+ = t('action_create_comment', comment: truncate(h(item.comment), length: 90)).html_safe
28
28
  - else
29
29
  - type = t(activity.item_type.downcase)
30
30
  - if item.respond_to? :email
31
- = avatar_for(item, :size => :thumb)
31
+ = avatar_for(item, size: :thumb)
32
32
  = type
33
33
  = subject
34
34
  = ":"
@@ -3,5 +3,5 @@
3
3
  trigger : "#asset",
4
4
  fade : 500,
5
5
  appear : 500,
6
- menu_items: [ #{sort_by_assets.join(",")} ]
6
+ menu_items: [ #{raw sort_by_assets.join(",")} ]
7
7
  });
@@ -1,6 +1,6 @@
1
1
  %li.highlight[opportunity]
2
2
  - if opportunity.stage
3
- .strip{:class => opportunity.stage}= t(opportunity.stage)
3
+ .strip{class: opportunity.stage}= t(opportunity.stage)
4
4
  - else
5
5
  .strip.white #{t :other}
6
6
 
@@ -12,23 +12,23 @@
12
12
  &ndash;
13
13
  - user_name = opportunity.user.try(:full_name)
14
14
  - if user_name
15
- = t(:added_by, :time_ago => timeago(opportunity.created_at), :user => h(user_name)).html_safe
15
+ = t(:added_by, time_ago: timeago(opportunity.created_at), user: h(user_name)).html_safe
16
16
  - else
17
- = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
17
+ = t(:added_ago, value: timeago(opportunity.created_at)).html_safe
18
18
  - unless current_user.preference[:opportunities_index_view] == "opportunities_index_brief"
19
19
  %dt
20
- %b= number_to_currency(opportunity.weighted_amount, :precision => 0) + " | "
20
+ %b= number_to_currency(opportunity.weighted_amount, precision: 0) + " | "
21
21
  - won_or_lost = %w(won lost).include?(opportunity.stage)
22
22
  - unless won_or_lost
23
23
  = t(:probability_number, (opportunity.probability || 0).to_s + '%') + " | "
24
24
  - if opportunity.closes_on
25
25
  - if won_or_lost
26
26
  - if opportunity.closes_on >= Date.today
27
- = t(:closing_date, l(opportunity.closes_on, :format => :mmddyy))
27
+ = t(:closing_date, l(opportunity.closes_on, format: :mmddyy))
28
28
  - else
29
- = t(:closed_ago_on, :time_ago => distance_of_time_in_words(opportunity.closes_on, Date.today), :date => l(opportunity.closes_on, :format => :mmddyy))
29
+ = t(:closed_ago_on, time_ago: distance_of_time_in_words(opportunity.closes_on, Date.today), date: l(opportunity.closes_on, format: :mmddyy))
30
30
  - elsif opportunity.closes_on > Date.today
31
- = t(:expected_to_close, :time => distance_of_time_in_words(Date.today, opportunity.closes_on), :date => l(opportunity.closes_on, :format => :mmddyy))
31
+ = t(:expected_to_close, time: distance_of_time_in_words(Date.today, opportunity.closes_on), date: l(opportunity.closes_on, format: :mmddyy))
32
32
  - elsif opportunity.closes_on == Date.today
33
33
  %span.warn= t(:closes_today)
34
34
  - else
@@ -38,4 +38,4 @@
38
38
  - if opportunity.tags.present?
39
39
  %dt
40
40
  .tags= tags_for_dashboard(opportunity)
41
- = hook(:opportunity_bottom, self, :opportunity => opportunity)
41
+ = hook(:opportunity_bottom, self, opportunity: opportunity)
@@ -1,9 +1,9 @@
1
1
  %p
2
- = link_to_close url_for(:action => "options")
2
+ = link_to_close url_for(action: "options")
3
3
  = hidden_field_tag "account[user_id]", current_user.id
4
4
 
5
5
  -# activity_options: Show %{models} %{action_type} performed by %{user} in the past %{period}
6
- = t(:activity_options, :models => link_to(t(h(@asset)).singularize.downcase, "#", :id => :asset), :action_type => link_to(t(h(@action) + "_past_participle").downcase, "#", :id => :event), :user => link_to(t(h(@user)), "#", :id => :user), :period => link_to(t(h(@duration)).downcase, "#", :id => :duration)).html_safe
6
+ = t(:activity_options, models: link_to(t(h(@asset)).singularize.downcase, "#", id: :asset), action_type: link_to(t(h(@action) + "_past_participle").downcase, "#", id: :event), user: link_to(t(h(@user)), "#", id: :user), period: link_to(t(h(@duration)).downcase, "#", id: :duration)).html_safe
7
7
 
8
8
  %script
9
9
  = render "assets_menu"
@@ -1,12 +1,12 @@
1
1
  %li.highlight[task]
2
2
  - unless task.category.blank?
3
- .strip{:class => task.category}= t(task.category)
3
+ .strip{class: task.category}= t(task.category)
4
4
  - else
5
5
  .strip.white #{t :other}
6
6
  .indent
7
- %label{ :id => dom_id(task, :name) }
7
+ %label{ id: dom_id(task, :name) }
8
8
  - if task.user.id != current_user.id
9
- = t(:task_from, link_to(h(task.user.full_name), user_path(task.user))).html_safe << ':'
9
+ = t(:task_from, link_to(h(task.user.full_name), user_path(task.user))).html_safe + ':'
10
10
  = link_to(task.name, tasks_path)
11
11
  - if task.asset_id?
12
12
  == #{t :related} #{link_to(task.asset.name, polymorphic_url(task.asset))}
@@ -26,20 +26,20 @@
26
26
  %span.warn
27
27
  = distance_of_time_in_words(task.due_at, Time.now)
28
28
  = t(:task_overdue)
29
- = l(task.due_at.localtime, :format => :mmddhhss)
29
+ = l(task.due_at.localtime, format: :mmddhhss)
30
30
  - else
31
31
  = t(:task_due_in, distance_of_time_in_words(Time.now, task.due_at))
32
- = '(' << l(task.due_at.localtime, :format => :mmddhhss) << ')'
32
+ = "(#{l(task.due_at.localtime, format: :mmddhhss)})"
33
33
 
34
34
  - else
35
35
  - if task.due_at < Date.today
36
36
  %span.warn
37
37
  = distance_of_time_in_words(task.due_at, Time.now)
38
38
  = t(:task_overdue)
39
- = l(task.due_at.localtime.to_date, :format => :mmdd)
39
+ = l(task.due_at.localtime.to_date, format: :mmdd)
40
40
  - elsif task.due_at > Date.today
41
41
  = t(:task_due_in, distance_of_time_in_words(Time.now, task.due_at.localtime.end_of_day))
42
- = ' (' << l(task.due_at.localtime.to_date, :format => :mmdd) << ')'
42
+ = " (#{l(task.due_at.localtime.to_date, format: :mmdd)})"
43
43
  - else
44
44
  %span.cool= t(:task_due_today)
45
45
 
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # http://www.atomenabled.org/developers/syndication/
2
4
  items = controller.controller_name
3
5
  item = items.singularize
@@ -6,10 +8,10 @@ assets = controller.instance_variable_get("@#{items}")
6
8
  atom_feed do |feed|
7
9
  feed.title t(:activities)
8
10
  feed.updated @activities.max_by(&:created_at).try(:created_at)
9
- feed.generator "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
11
+ feed.generator "Fat Free CRM v#{FatFreeCRM::VERSION::STRING}"
10
12
  feed.author do |author|
11
- author.name @current_user.full_name
12
- author.email @current_user.email
13
+ author.name current_user.full_name
14
+ author.email current_user.email
13
15
  end
14
16
 
15
17
  @activities.each do |activity|
@@ -5,7 +5,7 @@
5
5
  %span#title #{t :my_tasks}
6
6
  %ul.list#tasks
7
7
  - unless @my_tasks.empty?
8
- = render :partial => "home/task", :collection => @my_tasks.limit(10)
8
+ = render partial: "home/task", collection: @my_tasks.limit(10)
9
9
  = show_hidden_entities_message(@my_tasks.count, 'task', 10)
10
10
  - else
11
11
  #{t :no_task_records}
@@ -14,7 +14,7 @@
14
14
  %span#title #{t :my_opportunities}
15
15
  %ul.list#opportunities
16
16
  - unless @my_opportunities.empty?
17
- = render :partial => "home/opportunity", :collection => @my_opportunities.limit(10)
17
+ = render partial: "home/opportunity", collection: @my_opportunities.limit(10)
18
18
  = show_hidden_entities_message(@my_opportunities.count, 'opportunity', 10)
19
19
  - else
20
20
  #{t :no_opportunity_records}
@@ -23,22 +23,22 @@
23
23
  %span#title #{t :my_accounts}
24
24
  %ul.list#accounts
25
25
  - unless @my_accounts.empty?
26
- = render :partial => "home/account", :collection => @my_accounts.limit(10)
26
+ = render partial: "home/account", collection: @my_accounts.limit(10)
27
27
  = show_hidden_entities_message(@my_accounts.count, 'account', 10)
28
28
  - else
29
29
  #{t :no_account_records}
30
30
 
31
31
  .title_tools
32
- = link_to_inline(:options, url_for(:action => :options), :text => t(:options))
32
+ = link_to_inline(:options, url_for(action: :options), text: t(:options))
33
33
 
34
34
  .title
35
35
  %span#title #{t :recent_activity}
36
- = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
36
+ = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
37
37
  .remote#options{ hidden }
38
38
 
39
39
  %ul.list#activities
40
40
  - unless @activities.empty?
41
- = render :partial => "activity", :collection => @activities
41
+ = render partial: "activity", collection: @activities
42
42
  - else
43
43
  #{t :no_activity_records}
44
44