trusty-cms 7.0.1 → 7.0.3

data/vendor/extensions/multi-site-extension/lib/multi_site/scoped_model.rb

@@ -17,7 +17,7 @@ module MultiSite
       # that is, anything without a site is considered to be shared among all sites
       # the default is false
 
-      def is_site_scoped(options={})
+      def is_site_scoped(options = {})
         return if is_site_scoped?
 
         options = {
@@ -25,7 +25,7 @@ module MultiSite
         }.merge(options)
 
         class_eval <<-EO
-          default_scope {where(site_scope_condition)}
+          #{ self == User ? 'default_scope { joins(user_scope_condition) }' : 'default_scope { where(site_scope_condition) }' }
           extend MultiSite::ScopedModel::ScopedClassMethods
           include MultiSite::ScopedModel::ScopedInstanceMethods
         EO
@@ -52,8 +52,7 @@ module MultiSite
 
     module ScopedClassMethods
 
-
-      def paginate_with_site(options={})
+      def paginate_with_site(options = {})
         return paginate_without_site(options) unless sites?
         where(site_scope_condition) do
           paginate_without_site(options)
@@ -63,7 +62,7 @@ module MultiSite
       %w{count average minimum maximum sum}.each do |getter|
         define_method("#{getter}_with_site") do |*args|
           return send("#{getter}_without_site".intern, *args) unless sites?
-          with_scope(:find => {:conditions => site_scope_condition}) do
+          with_scope(:find => { :conditions => site_scope_condition }) do
             send "#{getter}_without_site".intern, *args
           end
         end
@@ -73,11 +72,11 @@ module MultiSite
       # and should only be used in odd cases like migration.
       def find_without_site(*args)
         options = args.extract_options!
-        #set_readonly_option!(options)
+        # set_readonly_option!(options)
 
         case args.first
-          when :first then find_initial_without_site(options)     # defined here
-          when :all   then all_without_site(options)       # already defined by the alias chain
+        when :first then find_initial_without_site(options) # defined here
+        when :all then all_without_site(options) # already defined by the alias chain
         end
       end
 
@@ -110,6 +109,12 @@ module MultiSite
         condition
       end
 
+      def user_scope_condition
+        return "" unless self.current_site
+
+        "INNER JOIN `admins_sites` ON `admins_sites`.`admin_id` = `admins`.`id` AND `admins_sites`.`site_id` = #{self.current_site.id}"
+      end
+
       def plural_symbol_for_class
         self.to_s.pluralize.underscore.intern
       end
@@ -125,9 +130,10 @@ module MultiSite
 
     module ScopedInstanceMethods
       protected
-        def set_site
-          self.site ||= self.class.current_site! unless self.class.is_shareable?
-        end
+
+      def set_site
+        self.site ||= self.class.current_site! unless self.class.is_shareable?
+      end
     end
   end
 end

data/vendor/extensions/multi-site-extension/lib/multi_site/site_chooser_helper.rb

@@ -1,14 +1,14 @@
 module MultiSite::SiteChooserHelper
 
-def sites_chooser_thing
-  return "" unless current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
-  options = Site.all.map{ |site| "<li>" + link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg' : '') + "</li>" }.join("")
-  chooser = %{<div id="site_chooser">}
-  #chooser << link_to("sites", admin_sites_url, {:id => 'show_site_list', :class => 'expandable'})
-  chooser << %{<ul id="nav"><li>Current Site: #{current_site.name}}
-  chooser << %{<ul class="expansion">#{options}</ul></li></ul>}
-  chooser << %{</div>}
-  chooser
-end
+  def sites_chooser_thing
+    return "" unless current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+    options = Site.all.map { |site| "<li>" + link_to(site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg' : '') + "</li>" }.join("")
+    chooser = %{<div id="site_chooser">}
+    # chooser << link_to("sites", admin_sites_url, {:id => 'show_site_list', :class => 'expandable'})
+    chooser << %{<ul id="nav"><li>Current Site: #{current_site.name}}
+    chooser << %{<ul class="expansion">#{options}</ul></li></ul>}
+    chooser << %{</div>}
+    chooser
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -301,7 +301,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -311,7 +311,7 @@ dependencies:
         version: 2.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -730,6 +730,7 @@ files:
 - app/mailers/application_mailer.rb
 - app/mailers/devise_mailer.rb
 - app/mailers/rad_social_mailer.rb
+- app/models/admins_site.rb
 - app/models/asset.rb
 - app/models/asset_type.rb
 - app/models/file_not_found_page.rb
@@ -753,7 +754,6 @@ files:
 - app/models/trusty_cms/page_response_cache_director.rb
 - app/models/user.rb
 - app/models/user_action_observer.rb
-- app/users/_choose_site.html.haml
 - app/views/admin/assets/_asset.html.haml
 - app/views/admin/assets/_asset_table.html.haml
 - app/views/admin/assets/_errors.html.haml
@@ -908,6 +908,7 @@ files:
 - db/migrate/20161027141250_add_position_to_pages.rb
 - db/migrate/20200117141251_create_admin_users.rb
 - db/migrate/20210331134718_create_active_storage_tables.active_storage.rb
+- db/migrate/20241108172942_create_site_users.rb
 - db/schema.rb
 - lib/active_record_extensions/active_record_extensions.rb
 - lib/annotatable.rb
@@ -1097,12 +1098,15 @@ files:
 - spec/factories/layout.rb
 - spec/factories/page.rb
 - spec/factories/page_part.rb
+- spec/factories/snippet.rb
 - spec/factories/user.rb
 - spec/features/config_spec.rb
 - spec/features/layouts_spec.rb
 - spec/features/pages_spec.rb
 - spec/fixtures/users.yml
 - spec/models/layout_spec.rb
+- spec/models/snippets_spec.rb
+- spec/models/user_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/custom_actions.rb
@@ -1248,12 +1252,15 @@ test_files:
 - spec/factories/layout.rb
 - spec/factories/page.rb
 - spec/factories/page_part.rb
+- spec/factories/snippet.rb
 - spec/factories/user.rb
 - spec/features/config_spec.rb
 - spec/features/layouts_spec.rb
 - spec/features/pages_spec.rb
 - spec/fixtures/users.yml
 - spec/models/layout_spec.rb
+- spec/models/snippets_spec.rb
+- spec/models/user_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/custom_actions.rb

data/app/users/_choose_site.html.haml

@@ -1,4 +0,0 @@
-- unless current_user.site
-    %label{:for=>"user_admin"} Can edit site
-    = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
-    .caption A user with no site is able to act (to whatever extent their status allows) on any site.