From 10567f1c7413ca7b08f656ee2297bf9852454086 Mon Sep 17 00:00:00 2001 From: manson Date: Tue, 24 Jun 2014 16:50:44 +0800 Subject: [PATCH] Fix email select box and update slug for ammouncement AGAIN --- app/models/concerns/slug.rb | 2 -- .../admin/member_selects/_email_selection_box.html.erb | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/concerns/slug.rb b/app/models/concerns/slug.rb index d82c0e4..81a4539 100644 --- a/app/models/concerns/slug.rb +++ b/app/models/concerns/slug.rb @@ -15,8 +15,6 @@ module Slug (self.slug_title.gsub(/[ "'*@#$%^&()+=;:.,?>|\\\/<~_!:,、。!?;「」〈〉【】/]/,'-')+"-"+self.uid).gsub(/-{2,}/,'-') rescue "-"+self.uid end - private - def generate_uid self.uid = rand(10**8).to_s generate_uid if self.class.where(:uid=>self.uid).size > 0 diff --git a/app/views/admin/member_selects/_email_selection_box.html.erb b/app/views/admin/member_selects/_email_selection_box.html.erb index 7ed7cba..89ae390 100644 --- a/app/views/admin/member_selects/_email_selection_box.html.erb +++ b/app/views/admin/member_selects/_email_selection_box.html.erb @@ -77,10 +77,10 @@ $("input[value='"+user_id+"']").parent("li").hide(); }); - $('.checkbox-card').click(function(){ + $('.check-item').click(function(){ var user_id = $(this).find("input[type='checkbox']").val(); - $(this).children(".check-item").toggleClass("active"); - if($(this).children(".check-item").hasClass("active")){ + $(this).toggleClass("active"); + if($(this).hasClass("active")){ mail_users.push(user_id); }else{ mail_users = $.grep(mail_users, function(value) {return value != user_id;});