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
@@ -1,5 +1,5 @@
1
1
  - entity_name = controller.controller_name.singularize.underscore #account
2
2
  - @entity = instance_variable_get("@#{entity_name}")
3
3
 
4
- $('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
4
+ $('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
5
5
  = raw generate_js_for_popups(@entity, :tasks, :contacts)
@@ -8,7 +8,7 @@
8
8
  crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
9
9
  = refresh_sidebar(:show, :summary)
10
10
  - else
11
- $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
11
+ $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
12
12
  $('##{id}').effect("highlight", { duration:1500 });
13
13
  - if called_from_index_page?
14
14
  = refresh_sidebar(:index, :filters)
@@ -17,9 +17,9 @@
17
17
  - elsif called_from_landing_page?(:campaigns)
18
18
  = refresh_sidebar_for(:campaigns, :show, :summary)
19
19
  - else
20
- $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
20
+ $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
21
21
  - else
22
- $('##{id}').html('#{ j render(:partial => "edit") }');
22
+ $('##{id}').html('#{ j render(partial: "edit") }');
23
23
  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
24
24
  $('##{id}').effect("shake", { duration:250, distance: 6 });
25
25
  $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
@@ -1,8 +1,8 @@
1
1
  .standalone
2
- = form_for(@user, :url => password_path(params[:id]), :html => one_submit_only, :method => :put) do |f|
2
+ = form_for(@user, url: password_path(params[:id]), html: one_submit_only, method: :put) do |f|
3
3
  .title #{t :reset_password}
4
4
 
5
- = f.error_messages :object_name => t('password')
5
+ = f.error_messages object_name: t('password')
6
6
 
7
7
  .intro #{t :confirm_password_intro}
8
8
  .section
@@ -7,4 +7,4 @@
7
7
  = text_field_tag :email
8
8
  %br
9
9
  .buttonbar
10
- = submit_tag t(:reset_password), :id => "passwords_submit"
10
+ = submit_tag t(:reset_password), id: "passwords_submit"
@@ -5,7 +5,7 @@
5
5
  - same_as_billing ||= false
6
6
 
7
7
  = f.fields_for(address_attr.to_sym) do |a|
8
- = a.hidden_field :address_type, :value => address_type
8
+ = a.hidden_field :address_type, value: address_type
9
9
  - unless Setting.compound_address
10
10
  - if same_as_billing
11
11
  %div
@@ -14,7 +14,7 @@
14
14
  .label #{t title}:
15
15
  - else
16
16
  .label #{t title}:
17
- = a.text_area :full_address, :style =>"width:240px", :rows => 4
17
+ = a.text_area :full_address, style: "width:240px", rows: 4
18
18
  - else
19
19
  %table.address(cellpadding="0" cellspacing="0")
20
20
  %tr
@@ -41,4 +41,4 @@
41
41
  = address_field(a, address, :zipcode, "width:80px;")
42
42
  %td= spacer
43
43
  %td
44
- = a.country_select(:country, priority_countries, { :include_blank => "" }, {:"data-placeholder" => t(:select_a_country), :style => "width:150px; margin-top:6px", :class => 'select2'})
44
+ = a.country_select(:country, priority_countries, { include_blank: "" }, {:"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2'})
@@ -1,5 +1,5 @@
1
1
  %li.highlight[comment]
2
- = link_to avatar_for(comment.user, :size => :small), user_path(comment.user)
2
+ = link_to avatar_for(comment.user, size: :small), user_path(comment.user)
3
3
 
4
4
  .tools
5
5
  = link_to_edit(comment) + " | "
@@ -1,13 +1,13 @@
1
1
  - class_name = commentable.class.name.downcase
2
- .comment#comment_edit{:style => "margin: 5px 0px 0px 0px"}
3
- = link_to avatar_for(current_user, :size => :small), user_path(current_user)
2
+ .comment#comment_edit{style: "margin: 5px 0px 0px 0px"}
3
+ = link_to avatar_for(current_user, size: :small), user_path(current_user)
4
4
  #post
5
- = form_for(@comment, :remote => true) do |f|
5
+ = form_for(@comment, remote: true) do |f|
6
6
  = hidden_field_tag "comment[user_id]", current_user.id
7
7
  = hidden_field_tag "comment[commentable_id]", commentable.id
8
8
  = hidden_field_tag "comment[commentable_type]", class_name.capitalize
9
9
  = f.text_area :comment
10
- %div{:style => "padding:6px 0px 0px 40px;"}
10
+ %div{style: "padding:6px 0px 0px 40px;"}
11
11
  = f.submit t :edit_note
12
12
  #{t :or}
13
- = link_to(t(:cancel), send("edit_#{class_name}_comment_url", commentable), :method => :get, :with => "'cancel=true'", :remote => true)
13
+ = link_to(t(:cancel), send("edit_#{class_name}_comment_url", commentable), method: :get, with: "'cancel=true'", remote: true)
@@ -3,6 +3,6 @@
3
3
  - new_asset_path = controller.class.to_s.include?("Admin") ? url_for([:new, :admin, asset]) : url_for([:new, asset])
4
4
  #empty
5
5
  - if @current_query.blank?
6
- == #{t(:could_not_find, t(assets.downcase))} #{link_to_inline(:"create_#{asset}", new_asset_path, :plain => true, :text => t(:create_a_new) << ' ' << t(asset + '_small'))}.
6
+ == #{t(:could_not_find, t(assets.downcase))} #{link_to_inline(:"create_#{asset}", new_asset_path, plain: true, text: "#{t(:create_a_new)} #{t(asset + '_small')}")}.
7
7
  - else
8
8
  == #{t(:could_not_find_matching, t(assets.downcase + '_small'))} <span class="cool"><b>#{h @current_query}</b></span>; #{t :please_retry}
@@ -3,7 +3,7 @@
3
3
 
4
4
  .per_page_options
5
5
  %span.per_page_label
6
- = t('entities_per_page', :entity => t(controller_name))
6
+ = t('entities_per_page', entity: t(controller_name))
7
7
 
8
8
  - [ 10, 20, 30, 50 ].each do |count|
9
9
  - if count == @per_page.to_i
@@ -1,4 +1,4 @@
1
1
  - title = (recent.item.respond_to?(:full_name) ? recent.item.full_name : recent.item.name)
2
- %li{ :class => recent != @versions.last ? "" : "last" }
3
- %dt= link_to(truncate(title, :length => 19), polymorphic_url(recent.item), :title => title)
2
+ %li{ class: recent != @versions.last ? "" : "last" }
3
+ %dt= link_to(truncate(title, length: 19), polymorphic_url(recent.item), title: title)
4
4
  %tt= t(recent.item_type.downcase) + ":"
@@ -2,6 +2,6 @@
2
2
  .panel#recently
3
3
  .caption #{t :recent_items}
4
4
  - if @versions.present?
5
- = render :partial => "shared/recent", :collection => @versions
5
+ = render partial: "shared/recent", collection: @versions
6
6
  - else
7
7
  %div #{t :no_recent_items}
@@ -2,8 +2,8 @@
2
2
  - path = "admin/#{path}" if controller.class.to_s.starts_with?("Admin::")
3
3
 
4
4
  %h4 #{t(:search_assets, t(controller.controller_name + "_small"))}
5
- %div{ :style => "margin: 0px 0px 6px 0px" }
6
- = text_field_tag('query', @current_query, :size => 23)
5
+ %div{ style: "margin: 0px 0px 6px 0px" }
6
+ = text_field_tag('query', @current_query, size: 23)
7
7
 
8
8
  :javascript
9
9
  var searchTimeout;
@@ -1,6 +1,6 @@
1
1
  - asset = controller_name.singularize
2
2
  %tr
3
- %td{ :valign => :top, :colspan => span }
3
+ %td{ valign: :top, colspan: span }
4
4
  .label= t(:tags) + ":"
5
5
 
6
- = f.select :tag_list, Tag.all.map{|t| t.name}, {}, {:class => "select2_tag", :data => {:tags => true, :url => url_for(action: 'field_group'), :placeholder => t(:select_or_create_tags), :multiple => true, :asset_id => f.object.try(:id)}, :multiple => true}
6
+ = f.select :tag_list, Tag.all.map{|t| t.name}, {}, {class: "select2_tag", data: {tags: true, url: url_for(action: 'field_group'), placeholder: t(:select_or_create_tags), multiple: true, asset_id: f.object.try(:id)}, multiple: true}
@@ -1,10 +1,10 @@
1
- - asset ||= instance_variable_get("@" << controller.controller_name.singularize)
1
+ - asset ||= instance_variable_get("@" + controller.controller_name.singularize)
2
2
  - asset.tasks.each do |task|
3
3
  - if task.completed_at?
4
- = render "tasks/completed", :completed => task, :bucket => nil
4
+ = render "tasks/completed", completed: task, bucket: nil
5
5
  - elsif task.my?(current_user)
6
- = render "tasks/pending", :pending => task, :bucket => nil
6
+ = render "tasks/pending", pending: task, bucket: nil
7
7
  - elsif task.assigned_by?(current_user)
8
- = render "tasks/assigned", :assigned => task, :bucket => nil
8
+ = render "tasks/assigned", assigned: task, bucket: nil
9
9
  - else
10
- = render "tasks/related", :related => task, :bucket => nil
10
+ = render "tasks/related", related: task, bucket: nil
@@ -1,7 +1,7 @@
1
- <%= I18n.t('comment_notification.intro', :user_full_name => @user.full_name, :entity_type => @entity_type, :entity_name => @entity_name) %>
1
+ <%= I18n.t('comment_notification.intro', user_full_name: @user.full_name, entity_type: @entity_type, entity_name: @entity_name) %>
2
2
 
3
3
  <%= sanitize(@comment.comment) %>
4
4
 
5
5
 
6
6
  --
7
- <%= I18n.t('comment_notification.reply_instructions', :entity => @entity_type.downcase) %>: <%= polymorphic_url(@entity) %>
7
+ <%= I18n.t('comment_notification.reply_instructions', entity: @entity_type.downcase) %>: <%= polymorphic_url(@entity) %>
@@ -1,6 +1,6 @@
1
1
  %li.highlight[assigned]
2
2
  - unless assigned.category.blank?
3
- .strip{:class => assigned.category}= t(assigned.category)
3
+ .strip{class: assigned.category}= t(assigned.category)
4
4
  - else
5
5
  .strip.white #{t :other}
6
6
 
@@ -27,16 +27,16 @@
27
27
  - if assigned.due_at < Time.now
28
28
  %span.warn= distance_of_time_in_words(assigned.due_at, Time.now)
29
29
  = t(:task_overdue)
30
- = l(assigned.due_at.localtime, :format => :mmddhhss)
30
+ = l(assigned.due_at.localtime, format: :mmddhhss)
31
31
  - else
32
32
  = t(:task_due_in, distance_of_time_in_words(Time.now, assigned.due_at))
33
- = '(' << l(assigned.due_at.localtime, :format => :mmddhhss) << ')'
33
+ = "(#{l(assigned.due_at.localtime, format: :mmddhhss)})"
34
34
 
35
35
  - else
36
36
  - if assigned.due_at < Date.today
37
37
  %span.warn= distance_of_time_in_words(assigned.due_at, Time.now)
38
38
  = t(:task_overdue)
39
- = l(assigned.due_at.localtime.to_date, :format => :mmdd)
39
+ = l(assigned.due_at.localtime.to_date, format: :mmdd)
40
40
  - elsif assigned.due_at > Date.today
41
41
  = t(:task_due_in, distance_of_time_in_words(Time.now, assigned.due_at.localtime.end_of_day))
42
42
  - else
@@ -1,6 +1,6 @@
1
1
  %li.highlight[completed]
2
2
  - unless completed.category.blank?
3
- .strip{:class => completed.category}= t(completed.category)
3
+ .strip{class: completed.category}= t(completed.category)
4
4
  - else
5
5
  .strip.white #{t :other}
6
6
 
@@ -19,7 +19,7 @@
19
19
  %tt
20
20
  %span.cool
21
21
  -# :task_completed_by: "completed {{time_ago}} ago by {{user}}"
22
- = t(:task_completed_by, :time_ago => distance_of_time_in_words(completed.completed_at, Time.now), :date => l(completed.completed_at, :format => :long), :user => ((completed.completor.id != current_user.id) ? link_to(h(completed.completor.full_name), user_path(completed.completor)) : t(:me))).html_safe
22
+ = t(:task_completed_by, time_ago: distance_of_time_in_words(completed.completed_at, Time.now), date: l(completed.completed_at, format: :long), user: ((completed.completor.id != current_user.id) ? link_to(h(completed.completor.full_name), user_path(completed.completor)) : t(:me))).html_safe
23
23
  - unless completed.background_info.blank?
24
24
  %div
25
25
  %dt= completed.background_info
@@ -1,12 +1,12 @@
1
1
  .remote
2
- = simple_form_for(@task, :html => one_submit_only, :remote => true) do |f|
2
+ = simple_form_for(@task, html: one_submit_only, remote: true) do |f|
3
3
  = link_to_close edit_task_path(@task)
4
4
  = hidden_field_tag :view, @view
5
5
  = hidden_field_tag "task[asset_id]", "#{@asset.id if @asset}"
6
6
  = hidden_field_tag "task[asset_type]", "#{@asset.class if @asset}"
7
7
 
8
- = render "tasks/top_section", :f => f, :edit => true
9
- = render "fields/groups", :f => f, :edit => true
8
+ = render "tasks/top_section", f: f, edit: true
9
+ = render "fields/groups", f: f, edit: true
10
10
 
11
11
  .buttonbar
12
12
  = f.submit t :save_task
@@ -14,5 +14,5 @@
14
14
  = link_to_cancel edit_task_path(@task)
15
15
  == #{t :or} #{t :move_to}
16
16
  - [ "due_asap", "due_today", "due_tomorrow", "due_this_week", "due_next_week", "due_later" ].each do |due_day|
17
- = link_to(t(due_day.to_sym), "#", :onclick => %Q/crm.reschedule_task(#{@task.id}, "#{due_day}")/)
17
+ = link_to(t(due_day.to_sym), "#", onclick: %Q/crm.reschedule_task(#{@task.id}, "#{due_day}")/)
18
18
  = " | " if due_day != "due_later"
@@ -1,4 +1,4 @@
1
1
  #empty
2
2
  == #{t(:no_tasks, t('no_tasks_' + @view))}.
3
3
  - if @view != "completed"
4
- == #{t :feel_free} #{link_to(t(:create_task_small), new_task_path + "?view=#{@view}", :remote => true)}.
4
+ == #{t :feel_free} #{link_to(t(:create_task_small), new_task_path + "?view=#{@view}", remote: true)}.
@@ -1,12 +1,12 @@
1
- = simple_form_for(@task, :html => one_submit_only, :remote => true) do |f|
1
+ = simple_form_for(@task, html: one_submit_only, remote: true) do |f|
2
2
  = link_to_close new_task_path + "?view=#{@view}"
3
3
  = hidden_field_tag :view, @view
4
4
  = hidden_field_tag "task[user_id]", current_user.id
5
5
  = hidden_field_tag "task[asset_id]", "#{@asset.id if @asset}"
6
6
  = hidden_field_tag "task[asset_type]", "#{@asset.class if @asset}"
7
7
 
8
- = render "tasks/top_section", :f => f
9
- = render "fields/groups", :f => f
8
+ = render "tasks/top_section", f: f
9
+ = render "fields/groups", f: f
10
10
 
11
11
  .buttonbar
12
12
  = f.submit t :create_task
@@ -1,6 +1,6 @@
1
1
  %li.highlight[pending]
2
2
  - unless pending.category.blank?
3
- .strip{:class => pending.category}= t(pending.category)
3
+ .strip{class: pending.category}= t(pending.category)
4
4
  - else
5
5
  .strip.white #{t :other}
6
6
 
@@ -9,12 +9,12 @@
9
9
  = link_to_discard(pending) + " | " if shown_on_landing_page?
10
10
  = link_to_task_delete(pending, bucket)
11
11
 
12
- = check_box_tag dom_id(pending, :complete), 1, false, :onclick => link_to_task_complete(pending, bucket)
12
+ = check_box_tag dom_id(pending, :complete), 1, false, onclick: link_to_task_complete(pending, bucket)
13
13
 
14
14
  .indentwide
15
- %label{ :id => dom_id(pending, :name) }
15
+ %label{ id: dom_id(pending, :name) }
16
16
  - if pending.user.id != current_user.id
17
- = t(:task_from, link_to(h(pending.user.full_name), user_path(pending.user))).html_safe << ':'
17
+ = t(:task_from, link_to(h(pending.user.full_name), user_path(pending.user))).html_safe + ':'
18
18
  = auto_link h(pending.name)
19
19
  - if pending.asset_id?
20
20
  =t :related
@@ -32,16 +32,16 @@
32
32
  - if pending.due_at < Time.now
33
33
  %span.warn= distance_of_time_in_words(pending.due_at, Time.now)
34
34
  = t(:task_overdue)
35
- = l(pending.due_at.localtime, :format => :mmddhhss)
35
+ = l(pending.due_at.localtime, format: :mmddhhss)
36
36
  - else
37
37
  = t(:task_due_in, distance_of_time_in_words(Time.now, pending.due_at.localtime))
38
- = '(' << l(pending.due_at.localtime, :format => :mmddhhss) << ')'
38
+ = "(#{l(pending.due_at.localtime, format: :mmddhhss)})"
39
39
 
40
40
  - else
41
41
  - if pending.due_at < Date.today
42
42
  %span.warn= distance_of_time_in_words(pending.due_at, Time.now)
43
43
  = t(:task_overdue)
44
- = l(pending.due_at.localtime.to_date, :format => :mmdd)
44
+ = l(pending.due_at.localtime.to_date, format: :mmdd)
45
45
  - elsif pending.due_at > Date.today
46
46
  = t(:task_due_in, distance_of_time_in_words(Time.now, pending.due_at.localtime.end_of_day))
47
47
  - else
@@ -1,8 +1,8 @@
1
1
  %li.highlight[related]
2
2
  - unless related.category.blank?
3
- .strip{:class => related.category}= t(related.category)
3
+ .strip{class: related.category}= t(related.category)
4
4
  - else
5
- .strip{:style => "color:white"} #{t :other}
5
+ .strip{style: "color:white"} #{t :other}
6
6
  %div
7
7
  - if related.assigned_to
8
8
  = link_to(related.assignee.full_name, user_path(related.assignee))
@@ -1,8 +1,8 @@
1
- %table{ :cellpadding => 3, :cellspacing => 0, :style => "width: 100%; margin: 2px 0px 10px 0px" }
1
+ %table{ cellpadding: 3, cellspacing: 0, style: "width: 100%; margin: 2px 0px 10px 0px" }
2
2
  %tr
3
- %td{ :class => "selector left " + (@view == "pending" ? "on" : "off"), :width => "33%", :onclick => %Q(document.location.href='#{tasks_path}') }
3
+ %td{ class: "selector left " + (@view == "pending" ? "on" : "off"), width: "33%", onclick: %Q(document.location.href='#{tasks_path}') }
4
4
  = t :pending_tab
5
- %td{ :class => "selector " + (@view == "assigned" ? "on" : "off"), :width => "33%", :onclick => %Q(document.location.href='#{url_for(:action => :index, :view => "assigned")}') }
5
+ %td{ class: "selector " + (@view == "assigned" ? "on" : "off"), width: "33%", onclick: %Q(document.location.href='#{url_for(action: :index, view: "assigned")}') }
6
6
  = t :assigned_tab
7
- %td{ :class => "selector right " + (@view == "completed" ? "on" : "off"), :width => "33%", :onclick => %Q(document.location.href='#{url_for(:action => :index, :view => "completed")}') }
7
+ %td{ class: "selector right " + (@view == "completed" ? "on" : "off"), width: "33%", onclick: %Q(document.location.href='#{url_for(action: :index, view: "completed")}') }
8
8
  = t :completed_tab
@@ -2,17 +2,17 @@
2
2
  = render "selector"
3
3
  - if @view == "pending" || @view == "assigned"
4
4
  - Setting.unroll(:task_bucket).each do |value, key|
5
- .check_box{:style => "border-bottom: 1px silver dotted;"}
6
- %div{:style => "float:right;"}
5
+ .check_box{style: "border-bottom: 1px silver dotted;"}
6
+ %div{style: "float:right;"}
7
7
  = @task_total[key]
8
- = task_filter_checkbox(@view, key, @task_total[key]) << " " << t(value)
8
+ = task_filter_checkbox(@view, key, @task_total[key]) + " " + t(value)
9
9
  - else # @view == "completed"
10
10
  - Setting.unroll(:task_completed).each do |value, key|
11
- .check_box{:style => "border-bottom: 1px silver dotted;"}
12
- %div{:style => "float:right;"}
11
+ .check_box{style: "border-bottom: 1px silver dotted;"}
12
+ %div{style: "float:right;"}
13
13
  = @task_total[key]
14
- = task_filter_checkbox(@view, key, @task_total[key]) << " " << t(value)
14
+ = task_filter_checkbox(@view, key, @task_total[key]) + " " + t(value)
15
15
  .check_box
16
- %div{:style => "float:right;"}
16
+ %div{style: "float:right;"}
17
17
  %b= @task_total[:all]
18
18
  %b== #{t(:total_tasks, t(@view + '_tasks'))}
@@ -1,8 +1,8 @@
1
1
  .title_tools
2
- = link_to_inline(:create_task, url_for(:action => :new, :view => @view), :text => t(:create_task))
2
+ = link_to_inline(:create_task, url_for(action: :new, view: @view), text: t(:create_task))
3
3
  .title#title
4
4
  = (@view == "assigned" ? t(:assigned_tasks) : t(:tasks))
5
- = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
5
+ = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
6
6
 
7
7
  .remote#options{ hidden }
8
8
  .remote#create_task{ hidden }
@@ -3,19 +3,19 @@
3
3
  %tr
4
4
  %td(colspan="5")
5
5
  .label.top.req #{t :name}:
6
- = f.text_field :name, :autofocus => true, :style => "width:500px"
6
+ = f.text_field :name, autofocus: true, style: "width:500px"
7
7
  %tr
8
8
  %td
9
9
  .label.req #{t :due}:
10
10
  - bucket = (params[:bucket].blank? ? @task.bucket : params[:bucket]) || "due_asap"
11
11
  - with_time = Setting.task_calendar_with_time
12
12
  - if @task.bucket != "specific_time"
13
- = f.select :bucket, @bucket, { :selected => bucket.to_sym }, { :style => "width:160px;", :onchange => "crm.flip_calendar(this.value)" }
14
- = f.text_field :calendar, :style => "width:160px; display:none;", :autocomplete => :off, :class => (with_time ? 'datetime' : 'date')
13
+ = f.select :bucket, @bucket, { selected: bucket.to_sym }, { style: "width:160px;", onchange: "crm.flip_calendar(this.value)", class: 'select2' }
14
+ = f.text_field :calendar, style: "width:160px; display:none;", autocomplete: :off, class: (with_time ? 'datetime' : 'date')
15
15
  - else
16
- = f.select :bucket, @bucket, { :selected => :specific_time }, { :style => "width:160px; display:none;", :onchange => "crm.flip_calendar(this.value)" }
16
+ = f.select :bucket, @bucket, { selected: :specific_time }, { style: "width:160px; display:none;", onchange: "crm.flip_calendar(this.value)", class: 'select2' }
17
17
  - fmt = with_time ? '%Y-%m-%d %H:%M' : '%Y-%m-%d'
18
- = f.text_field :calendar, :value => f.object.due_at.strftime(fmt), :style => "width:160px;", :autocomplete => :off, :class => (with_time ? 'datetime' : 'date')
18
+ = f.text_field :calendar, value: f.object.due_at.strftime(fmt), style: "width:160px;", autocomplete: :off, class: (with_time ? 'datetime' : 'date')
19
19
  %td= spacer
20
20
  %td
21
21
  .label.req #{t :assign_to}:
@@ -23,12 +23,12 @@
23
23
  %td= spacer
24
24
  %td
25
25
  .label.req #{t :category}:
26
- = f.select :category, @category, { :selected => @task.category.blank? ? nil : @task.category.to_sym, :include_blank => t(:select_blank) }, { :style => "width:160px" }
26
+ = f.select :category, @category, { selected: @task.category.blank? ? nil : @task.category.to_sym, include_blank: t(:select_blank) }, { style: "width:160px", class: 'select2' }
27
27
 
28
28
  - if Setting.background_info && Setting.background_info.include?(:task)
29
29
  %tr
30
30
  %td(colspan="5")
31
- .label= t(:extra_info).capitalize << ':'
32
- = f.text_area :background_info, :style =>"width:500px", :rows => 3
31
+ .label= t(:extra_info).capitalize + ':'
32
+ = f.text_area :background_info, style: "width:500px", rows: 3
33
33
 
34
- = hook(:task_top_section_bottom, self, :f => f)
34
+ = hook(:task_top_section_bottom, self, f: f)
@@ -9,6 +9,6 @@
9
9
  - else # Completing from the Asset page -- replace task partial with completed one.
10
10
 
11
11
  $('##{dom_id(@task)}').hide();
12
- $('##{dom_id(@task)}').html('#{ j render(:partial => "tasks/completed", :collection => [ @task ], :locals => { :bucket => nil }) }');
12
+ $('##{dom_id(@task)}').html('#{ j render(partial: "tasks/completed", collection: [ @task ], locals: { bucket: nil }) }');
13
13
  $('##{dom_id(@task)}').fadeIn({ duration:500 });
14
- $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
14
+ $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
@@ -7,20 +7,20 @@
7
7
 
8
8
  -# Show flash if assigned to somebody else from the [Pending Tasks] page.
9
9
  - if @view == "pending" && @task.assigned_to && @task.assigned_to != current_user.id
10
- $('#flash').html('#{j t(:task_created)} #{j t(:task_assigned_to, @task.assignee.full_name)} (#{j link_to(t(:view_assigned_tasks), url_for(:view => "assigned"))}).');
10
+ $('#flash').html('#{j t(:task_created)} #{j t(:task_assigned_to, @task.assignee.full_name)} (#{j link_to(t(:view_assigned_tasks), url_for(view: "assigned"))}).');
11
11
  crm.flash('notice', true);
12
- $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
12
+ $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
13
13
 
14
14
  - # Show flash if assigned to current user from the [Assigned Tasks] page.
15
15
  - elsif @view == "assigned" && @task.assigned_to.blank?
16
16
  $('#flash').html('#{j t(:task_created)} (#{j link_to(t(:view_pending_tasks), tasks_url)}).');
17
17
  crm.flash('notice', true);
18
- $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
18
+ $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
19
19
 
20
20
  - else # Show newly created task by inserting its div into appropriate bucket; then update tasks sidebar.
21
21
  - bucket = @task.computed_bucket
22
22
  $('#list_#{bucket}').show();
23
- $('##{bucket}').before('#{ j render(:partial => @view, :collection => [ @task ], :locals => { :bucket => bucket }) }');
23
+ $('##{bucket}').before('#{ j render(partial: @view, collection: [ @task ], locals: { bucket: bucket }) }');
24
24
  $('##{dom_id(@task)}').effect("highlight", { duration:1500 });
25
25
  = refresh_sidebar(:index, :filters)
26
26
 
@@ -29,9 +29,9 @@
29
29
  - else # Inline [Create Task] form reqested from any of the core asset landing pages.
30
30
  $('#create_task_title').html('#{ j t(:tasks) }');
31
31
  - partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
32
- $('#tasks').prepend('#{ j render(:partial => "tasks/#{partial}", :collection => [@task], :locals => { :bucket => nil }) }');
32
+ $('#tasks').prepend('#{ j render(partial: "tasks/#{partial}", collection: [@task], locals: { bucket: nil }) }');
33
33
  $('##{dom_id(@task)}').effect("highlight", { duration:1500 });
34
- $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
34
+ $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
35
35
 
36
36
  - else # Couldn't create the task -- validation failed.
37
37
  $('#create_task').effect("shake", { duration:250, distance: 6 });