app/controllers/group_permissions_controller.rb app/controllers/groupphotos_controller.rb app/controllers/groups_controller.rb app/controllers/memberships_controller.rb app/helpers/application_helper.rb app/helpers/group_permissions_helper.rb app/helpers/groupphotos_helper.rb app/helpers/groups_helper.rb app/helpers/memberships_helper.rb app/models/group.rb app/models/group_permission.rb app/models/group_role.rb app/models/groupphoto.rb app/models/membership.rb app/models/membership_status.rb app/views/group_permissions/.svn/all-wcprops app/views/group_permissions/.svn/entries app/views/group_permissions/.svn/format app/views/group_permissions/.svn/text-base/edit.html.erb.svn-base app/views/group_permissions/.svn/text-base/index.html.erb.svn-base app/views/group_permissions/.svn/text-base/new.html.erb.svn-base app/views/group_permissions/.svn/text-base/show.html.erb.svn-base app/views/group_permissions/edit.html.erb app/views/group_permissions/index.html.erb app/views/group_permissions/new.html.erb app/views/group_permissions/show.html.erb app/views/groupphotos/.svn/all-wcprops app/views/groupphotos/.svn/entries app/views/groupphotos/.svn/format app/views/groupphotos/.svn/text-base/_manage_groupphotos.haml.svn-base app/views/groupphotos/.svn/text-base/_show_image_list.haml.svn-base app/views/groupphotos/.svn/text-base/edit.html.haml.svn-base app/views/groupphotos/.svn/text-base/index.html.haml.svn-base app/views/groupphotos/.svn/text-base/index.rxml.svn-base app/views/groupphotos/.svn/text-base/manage_groupphotos.rjs.svn-base app/views/groupphotos/.svn/text-base/new.html.haml.svn-base app/views/groupphotos/.svn/text-base/recent.html.haml.svn-base app/views/groupphotos/.svn/text-base/show.html.haml.svn-base app/views/groupphotos/.svn/text-base/slideshow.rhtml.svn-base app/views/groupphotos/_manage_groupphotos.haml app/views/groupphotos/_show_image_list.haml app/views/groupphotos/edit.html.haml app/views/groupphotos/index.html.haml app/views/groupphotos/index.rxml app/views/groupphotos/manage_groupphotos.rjs app/views/groupphotos/new.html.haml app/views/groupphotos/recent.html.haml app/views/groupphotos/show.html.haml app/views/groupphotos/slideshow.rhtml app/views/groups/.svn/all-wcprops app/views/groups/.svn/entries app/views/groups/.svn/format app/views/groups/.svn/prop-base/edit.html.haml.svn-base app/views/groups/.svn/prop-base/index.html.haml.svn-base app/views/groups/.svn/prop-base/new.html.haml.svn-base app/views/groups/.svn/prop-base/show.html.haml.svn-base app/views/groups/.svn/text-base/_group.html.haml.svn-base app/views/groups/.svn/text-base/_profile_group_info_sidebar.html.haml.svn-base app/views/groups/.svn/text-base/_search_options.html.haml.svn-base app/views/groups/.svn/text-base/edit.html.haml.svn-base app/views/groups/.svn/text-base/index.html.haml.svn-base app/views/groups/.svn/text-base/new.html.haml.svn-base app/views/groups/.svn/text-base/roster.html.haml.svn-base app/views/groups/.svn/text-base/show.html.haml.svn-base app/views/groups/_group.html.haml app/views/groups/_profile_group_info_sidebar.html.haml app/views/groups/_search_options.html.haml app/views/groups/edit.html.haml app/views/groups/index.html.haml app/views/groups/new.html.haml app/views/groups/show.html.haml app/views/memberships/.svn/all-wcprops app/views/memberships/.svn/entries app/views/memberships/.svn/format app/views/memberships/.svn/text-base/_membership.html.haml.svn-base app/views/memberships/.svn/text-base/accepted.html.haml.svn-base app/views/memberships/.svn/text-base/denied.html.haml.svn-base app/views/memberships/.svn/text-base/edit.html.erb.svn-base app/views/memberships/.svn/text-base/index.html.erb.svn-base app/views/memberships/.svn/text-base/new.html.erb.svn-base app/views/memberships/.svn/text-base/pending.html.haml.svn-base app/views/memberships/.svn/text-base/show.html.erb.svn-base app/views/memberships/_membership.html.haml app/views/memberships/accepted.html.haml app/views/memberships/denied.html.haml app/views/memberships/edit.html.erb app/views/memberships/index.html.erb app/views/memberships/new.html.erb app/views/memberships/pending.html.haml app/views/memberships/show.html.erb app/views/shared/_group_location_chooser.html.haml db/migrate/063_create_groups.rb db/migrate/064_add_type_to_group.rb db/migrate/065_create_user_groups.rb db/migrate/066_create_memberships.rb db/migrate/067_add_type_to_role.rb db/migrate/068_create_group_permissions.rb db/migrate/069_rename_role_id_to_group_role_id_in_group_permissions.rb db/migrate/070_add_groups_count_to_metro_area.rb db/migrate/071_add_state_id_country_id_metro_area_id_to_groups.rb db/migrate/072_create_groupphotos.rb db/migrate/073_add_avatar_id_to_groups.rb db/migrate/074_add_description_to_groups.rb db/migrate/075_add_view_count_to_groups.rb db/migrate/076_set_default_value_on_view_count_in_groups.rb db/migrate/077_create_membership_statuses.rb db/migrate/078_add_membership_statuses.rb db/migrate/079_add_initiator_to_memberships.rb @@ -35,7 +35,24 @@ class Comment < ActiveRecord::Base :limit => options[:limit] ) end - + + def self.find_groupphoto_comments_for(group) + Comment.find(:all, :conditions => ["recipient_id = ? AND commentable_type = ?", group.owner.id, 'Groupphoto'], :order => 'created_at DESC') + end + + def self.find_group_comments_for(group) + Comment.find(:all, :conditions => ["recipient_id = ? AND commentable_type = ?", group.owner.id, 'Group'], :order => 'created_at DESC') + end + + def self.find_comments_by_group(group, *args) + options = args.extract_options! + find(:all, + :conditions => ["commentable_id = ?", group.id], + :order => "created_at DESC", + :limit => options[:limit] + ) + end + def previous_commenters_to_notify # only send a notification on recent comments # limit the number of emails we'll send (or posting will be slooowww) app/models/comment.rb @@ -53,6 +53,11 @@ class User < ActiveRecord::Base has_many :friendships_not_initiated_by_me, :class_name => "Friendship", :foreign_key => "user_id", :conditions => ['initiator = ?', false], :dependent => :destroy has_many :occurances_as_friend, :class_name => "Friendship", :foreign_key => "friend_id", :dependent => :destroy + #group associations + has_many :memberships + has_many :groups, :through => :membership, :order => 'name' + has_many :memberships_initiated_by_me, :class_name => "Membership", :foreign_key => "user_id", :conditions => ['initiator = ?', true], :dependent => :destroy + #forums has_many :moderatorships, :dependent => :destroy has_many :forums, :through => :moderatorships, :order => 'forums.name' @@ -82,6 +87,22 @@ class User < ActiveRecord::Base ## Class Methods + def is_in_group?(group) + groups.find_by_id(group.id) + end + + def can_request_membership_with(group) + !self.eql?(group.owner) && !self.membership_exists_with?(group) + end + + def membership_exists_with?(group) + Membership.find(:first, :conditions => ["group_id = ? AND user_id = ?", group.id, self.id]) + end + + def has_reached_daily_member_request_limit? + memberships_initiated_by_me.count(:conditions => ['created_at > ?', Time.now.beginning_of_day]) >= Membership.daily_request_limit + end + # override activerecord's find to allow us to find by name or id transparently def self.find(*args) if args.is_a?(Array) and args.first.is_a?(String) and (args.first.index(/[a-zA-Z\-_]+/) or args.first.to_i.eql?(0) ) app/models/user.rb @@ -7,15 +7,15 @@ \: = text_field_tag 'login', nil, :size => 35 - %label{"for"=>"password"} + %label{"for"=>"password"} =:password.l \: = password_field_tag 'password', nil, :size => 35 %fieldset - %label{"for"=>"remember_me"} + %label{"for"=>"remember_me"} =:remember_me.l \: = check_box_tag 'remember_me' - + %p= submit_tag :log_in.l app/views/base/teaser.html.haml @@ -2,7 +2,20 @@ recent_forum_posts '/forums/recent', :controller => 'sb_posts', :action => 'index' resources :forums, :sb_posts, :monitorship resources :sb_posts, :name_prefix => 'all_', :collection => { :search => :get, :monitored => :get } +resources :group_permissions +memberships '/memberships', :controller => 'memberships', :action => 'index' + +resources :groups, :member => { + :change_profile_groupphoto => :put, + :welcome_groupphoto => :get, + :roster => :get, + } do |group| + group.resources :groupphotos, :collection => {:swfupload => :post, :slideshow => :get} + group.resources :memberships, :member => { :accept => :put, :deny => :put }, :collection => { :accepted => :get, :pending => :get, :denied => :get } +end + + %w(forum).each do |attr| resources :sb_posts, :name_prefix => "#{attr}_", :path_prefix => "/#{attr.pluralize}/:#{attr}_id" end @@ -124,6 +137,8 @@ resources :users, :member_path => '/:id', :nested_member_path => '/:user_id', :m user.resources :favorites, :name_prefix => 'user_' user.resources :messages, :collection => { :delete_selected => :post, :auto_complete_for_username => :any } user.resources :comments + user.resources :groups + end resources :votes resources :invitations config/desert_routes.rb @@ -13,6 +13,73 @@ en: attributes: photo: created_at: "created at: " + +#Group Additions Begin + thumbnail: Thumbnail + add: Add + remove: Remove + tell_us: Tell us what do you think! + +#Memberships + request_membership: I'm a fan!! + sorry_there_was_an_error_requesting_membership: Sorry, there was an error requesting membership. + requesting_membership: Requesting membership + membership_requested: Requested membership with {group}. + requested_membership_with: Requested membership with + pending_memberships: Pending Memberships + accepted_memberships: Accepted Memberships + the_membership_was_accepted: The membership was accepted + my_members: Our Fans + view_all_my_member_requests: View all fan requests + +#Groups + groups: Groups + new_group: New Group + editing_group: Editing Group + edit_group: Edit Group Details + site_groups: "{site} Groups" + created_a_group: created a new Group + search_groups: Search Groups + group_name: Group Name + back_to_all_groups: Back to all Groups + group_details: Group Details + group_views: Group Views + small_group: "{group} doesn't have much here yet. Stay tuned." + groups_recent_comments: Recent comments + group_comments: Group comments + group_roster: Manage Group Roster + manager_controls: Group Manager Controls + make_fan: Add to Fans + is_now_a: "{user} is now a {rolename} with the {group} Group" + + +#GroupPhotos + choose_a_photo_for_your_group: Choose a Photo for your Group + group_photo: Group Photo + add_a_groupphoto: Add Group Photo + view_all_groupphotos: Check out all Group Photos + group_photos: Group Photos + groups_groupphotos: "{group}'s Photos" + new_groupphoto: New photo + groupphoto_tip_1: Photos show your Group to the world. Pick your best pics, and give them good titles and descriptions. + groupphoto_tip_2: Use tags to organize your photos. Separate tags with commas. + back_to_my_groupphotos: Back to your Groups photos + cancel_and_go_back_to_my_groupphotos: cancel and go back to your Groups photos + related_groupphotos_all_members: Related Photos (all members) + groupphotos: Group Photos + make_this_my_profile_groupphoto: Make this my Groups profile photo + edit_this_groupphoto_details: Edit this photo + delete_this_groupphoto: Delete this photo + groupphoto_comments: Photo comments + tags_are_keywords_you_use_to_organize_your_groupphotos: Tags are keywords you use to organize your photos. Separate multiple tags with commas. + show_this_groupphoto: Show this photo + back_to_my_groupphotos: Back to Groups photos + are_you_sure_you_want_to_delete_this_groupphoto: "Are you sure you want to delete this photo?" + editing_groupphoto: Editing photo + uploaded_a_groupphoto: uploaded a Group photo + no_profile_groupphoto: No Group photo + view_all_my_groupphotos: View all Group photos + #en: a_few_seconds_ago: a few seconds ago a_few_seconds_ago: a few seconds ago #en: about: About lang/ui/en-US.yml @@ -16,6 +16,7 @@ - Category.find(:all).each do |c| = topnav_tab c.name, {:url => category_path(c), :section => c.name} = topnav_tab "Discussions", { :url => forums_path, :section => 'forums' } + = topnav_tab :groups.l, { :url => groups_path, :section => 'groups' } = topnav_tab "Profiles", { :url => users_path, :section => 'users' } - if current_user = topnav_tab "My Profile", { :url => user_path(current_user), :section => 'my_profile'} sample_files/sample_themes/dappled/views/shared/_header.html.haml 17f1181de601faba635a88a719fe5cbaccd97eb3 a2d2f4b5c13a9a136d49f7cc1b94746219e9c83e bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/b6a2d9a1b03370b59b712cc7e0282af3ace26dc8 b6a2d9a1b03370b59b712cc7e0282af3ace26dc8 2009-06-17T19:09:53-07:00 2009-06-17T19:09:53-07:00 Merge branch 'master' of git://github.com/LeviRosol/communityengine into LeviRosol/master 752e3924ad3893f1a508e38aa8301974da7c2b72 bborn bruno.bornsztein@gmail.com