trusty-cms 3.3.2 → 3.3.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/INSTALL.md +4 -11
  4. data/app/models/site.rb +1 -1
  5. data/coverage/index.html +1 -1
  6. data/db/migrate/001_create_radiant_tables.rb +1 -1
  7. data/db/migrate/002_insert_initial_data.rb +1 -1
  8. data/db/migrate/004_rename_filter_column.rb +1 -1
  9. data/db/migrate/005_add_virtual_column_to_page.rb +1 -1
  10. data/db/migrate/006_remove_user_login_index.rb +1 -1
  11. data/db/migrate/007_remove_virtual_column_from_page.rb +1 -1
  12. data/db/migrate/008_add_virtual_column_to_page_again.rb +1 -1
  13. data/db/migrate/009_add_content_type_field_to_layout.rb +1 -1
  14. data/db/migrate/010_create_sites.rb +1 -1
  15. data/db/migrate/011_add_order_to_sites.rb +1 -1
  16. data/db/migrate/012_create_extension_meta.rb +1 -1
  17. data/db/migrate/013_add_notes_field_to_user.rb +1 -1
  18. data/db/migrate/014_rename_config_default_parts_key.rb +1 -1
  19. data/db/migrate/015_add_optimistic_locking.rb +1 -1
  20. data/db/migrate/016_add_sessions.rb +1 -1
  21. data/db/migrate/017_rename_created_by_updated_by_columns.rb +1 -1
  22. data/db/migrate/018_add_description_and_keywords_to_pages.rb +1 -1
  23. data/db/migrate/020_add_session_info_to_users.rb +1 -1
  24. data/db/migrate/021_remove_session_expire_from_users.rb +1 -1
  25. data/db/migrate/022_add_admin_fields_to_sites.rb +1 -1
  26. data/db/migrate/023_add_sites.rb +1 -1
  27. data/db/migrate/024_site_abbreviation.rb +1 -1
  28. data/db/migrate/025_recreate_non_unique_index_on_snippets_name.rb +1 -1
  29. data/db/migrate/026_add_site_id_to_pages.rb +1 -1
  30. data/db/migrate/027_add_base_domain_to_sites.rb +1 -1
  31. data/db/migrate/028_create_assets.rb +1 -1
  32. data/db/migrate/029_create_paperclip_attributes.rb +1 -1
  33. data/db/migrate/030_create_user_observer.rb +1 -1
  34. data/db/migrate/031_create_page_attachments.rb +1 -1
  35. data/db/migrate/032_rename_users.rb +1 -1
  36. data/db/migrate/20081203140407_add_indexes.rb +1 -1
  37. data/db/migrate/20090226140109_add_user_language.rb +1 -1
  38. data/db/migrate/20090929164633_rename_developer_role_to_designer.rb +1 -1
  39. data/db/migrate/20091003095744_change_user_language_to_locale.rb +1 -1
  40. data/db/migrate/20100805154952_add_page_fields.rb +1 -1
  41. data/db/migrate/20100805155020_convert_page_metas.rb +1 -1
  42. data/db/migrate/20100810151922_add_field_name_index.rb +1 -1
  43. data/db/migrate/20110513205050_asset_uuid.rb +1 -1
  44. data/db/migrate/20110606111250_update_configuration.rb +1 -1
  45. data/db/migrate/20110609101438_dimensions.rb +1 -1
  46. data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb +1 -1
  47. data/db/migrate/20111016150725_extend_page_part_content_limit.rb +1 -1
  48. data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb +1 -1
  49. data/db/migrate/20160527141249_add_password_reset_to_users.rb +1 -1
  50. data/db/migrate/20161027141250_add_position_to_pages.rb +1 -1
  51. data/lib/generators/extension/templates/migration.rb +1 -1
  52. data/lib/generators/extension_migration/templates/migration.rb +1 -1
  53. data/lib/generators/extension_model/templates/migration.rb +1 -1
  54. data/lib/tasks/database.rake +5 -6
  55. data/lib/trusty_cms.rb +1 -1
  56. data/spec/dummy/log/test.log +10454 -0
  57. data/spec/dummy/tmp/cache/747/A70/TrustyCms%3A%3AConfig +0 -0
  58. data/spec/dummy/tmp/cache/85C/FA0/TrustyCms.cache_mtime +0 -0
  59. data/trusty_cms.gemspec +1 -1
  60. data/vendor/extensions/multi-site-extension/lib/multi_site/page_extensions.rb +3 -1
  61. metadata +2 -4
  62. data/CHANGELOG.md +0 -754
data/trusty_cms.gemspec CHANGED
@@ -13,7 +13,7 @@ It is built with Rails and is similar to Textpattern or MovableType, but is
13
13
  a general purpose content managment system--not merely a blogging engine.}
14
14
  s.email = %q{saalon@gmail.com}
15
15
  s.executables = ["trusty_cms"]
16
- s.extra_rdoc_files = ["README.md", "CONTRIBUTORS.md", "CHANGELOG.md", "INSTALL.md", "LICENSE.md"]
16
+ s.extra_rdoc_files = ["README.md", "CONTRIBUTORS.md", "INSTALL.md", "LICENSE.md"]
17
17
  ignores = File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
18
18
  s.files = Dir['**/*','.gitignore', 'public/.htaccess', 'log/.keep', 'vendor/extensions/.keep'] - ignores
19
19
  s.homepage = %q{https://github.com/pgharts/trusty-cms}
data/vendor/extensions/multi-site-extension/lib/multi_site/page_extensions.rb CHANGED
@@ -52,7 +52,9 @@ module MultiSite::PageExtensions
52
52
 
53
53
  module InstanceMethods
54
54
  def associate_with_site
55
- self.site_id = self.parent.site.id if self.site_id.nil?
55
+ if self.site_id.nil?
56
+ self.site_id = self.parent.present? ? self.parent.site.id : Site.first.id
57
+ end
56
58
  end
57
59
  end
58
60
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.2
4
+ version: 3.3.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-26 00:00:00.000000000 Z
11
+ date: 2018-04-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: acts_as_list
@@ -399,12 +399,10 @@ extensions: []
399
399
  extra_rdoc_files:
400
400
  - README.md
401
401
  - CONTRIBUTORS.md
402
- - CHANGELOG.md
403
402
  - INSTALL.md
404
403
  - LICENSE.md
405
404
  files:
406
405
  - ".gitignore"
407
- - CHANGELOG.md
408
406
  - CODE_OF_CONDUCT.md
409
407
  - CONTRIBUTORS.md
410
408
  - Gemfile