@@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.svn +.DS_Store .gitignore @@ -17,12 +17,25 @@ class Member::GroupsController < Member::BaseController @group.activate_membership(current_user) if @group.errors.empty? - if current_user.admin == true || Tog::Config['plugins.tog_social.group.moderation.creation'] != 'true' + if current_user.admin == true || Tog::Config['plugins.tog_social.group.moderation.creation'] != true @group.activate! flash[:ok] = I18n.t("tog_social.groups.member.created") redirect_to group_path(@group) else - GroupMailer.deliver_activation_request(@group) + + admins = User.find_all_by_admin(true) + admins.each do |admin| + Message.new( + :from => current_user, + :to => admin, + :subject => I18n.t("tog_social.groups.member.mail.activation_request.subject", :group_name => @group.name), + :content => I18n.t("tog_social.groups.member.mail.activation_request.content", + :user_name => current_user.profile.full_name, + :group_name => @group.name, + :activation_url => edit_admin_group_url(@group)) + ).dispatch! + end + flash[:warning] = I18n.t("tog_social.groups.member.pending") redirect_to groups_path end app/controllers/member/groups_controller.rb @@ -1,13 +1,5 @@ class GroupMailer < ActionMailer::Base - def activation_request(group) - setup_email(group.author.email, Tog::Config["plugins.tog_core.mail.system_from_address"]) - @subject += ' Group pending approval' - @body[:url] = groups_url - @body[:group] = group - @body[:user] = group.author - end - def join_request(group, user) setup_email(user.email, group.author.email) @subject += " Request for joining #{group.name}" app/models/group_mailer.rb @@ -55,6 +55,10 @@ en: user_accepted: User '{{name}}' has been accepted for this group error: Oooops. Something happened not_moderator: You are not one of this group's moderators. + mail: + activation_request: + subject: Request for new group '{{group_name}}' + content: "<p>User '{{user_name}}' has requested the creation of a new group called '{{group_name}}'.</p><p><a href=\"{{activation_url}}\">{{activation_url}}</a></p>" admin: groups: Groups deleted: Group deleted locale/tog_social.yml @@ -48,13 +48,18 @@ es: unactive: Error. Este grupo no está activo member: created: Grupo creado con éxito. - pending: Tu grupo ha sidp creado pero está pendiente de aprobación por un administrador + pending: Tu grupo ha sido creado pero está pendiente de aprobación por un administrador updated: Grupo '{{name}}' actualizado con éxito" user_doesnt_exist: El usuario no existe user_rejected: El usuario '{{name}}' ha sido rechazado para este grupo user_accepted: El usuario '{{name}}' ha sido aceptado para este grupo error: Oooops. Algo ha ido mal not_moderator: No eres un moderador de este grupo + mail: + activation_request: + subject: Solicitud de nuevo grupo '{{group_name}}' + content: "<p>El usuario '{{user_name}}' ha solicitado la creación de un nuevo grupo llamado '{{group_name}}'.</p><p><a href=\"{{activation_url}}\">{{activation_url}}</a></p>" + admin: groups: Grupos deleted: Grupo eliminado locale/tog_social_es.yml 7aad0802f336ac2bb54afe7cf72f80cc1faa007e Alberto Molpeceres alberto.molpeceres@gmail.com http://github.com/tog/tog_social/commit/3be1610afcb982a38889f5752f22324ebebd6033 3be1610afcb982a38889f5752f22324ebebd6033 2009-02-23T09:37:50-08:00 2009-02-23T09:37:50-08:00 new group request sended to all admin via internal messaging system if group creation is moderated 9db6831862f04a98d140155d832520c5cf12d45a Alberto Molpeceres alberto.molpeceres@gmail.com