alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix email select box and update slug for ammouncement AGAIN

This commit is contained in:
manson 2014-06-24 16:50:44 +08:00
parent c1140632cd
commit 10567f1c74
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/slug.rb
View File

@ -15,8 +15,6 @@ module Slug
(self.slug_title.gsub(/[ "'*@#$%^&()+=;:.,?>|\\\/<~_!：，、。！？；「」〈〉【】／]/,'-')+"-"+self.uid).gsub(/-{2,}/,'-') rescue "-"+self.uid (self.slug_title.gsub(/[ "'*@#$%^&()+=;:.,?>|\\\/<~_!：，、。！？；「」〈〉【】／]/,'-')+"-"+self.uid).gsub(/-{2,}/,'-') rescue "-"+self.uid
end end
private
def generate_uid def generate_uid
self.uid = rand(10**8).to_s self.uid = rand(10**8).to_s
generate_uid if self.class.where(:uid=>self.uid).size > 0 generate_uid if self.class.where(:uid=>self.uid).size > 0

6
app/views/admin/member_selects/_email_selection_box.html.erb
View File

@ -77,10 +77,10 @@
$("input[value='"+user_id+"']").parent("li").hide(); $("input[value='"+user_id+"']").parent("li").hide();
}); });
$('.checkbox-card').click(function(){ $('.check-item').click(function(){
var user_id = $(this).find("input[type='checkbox']").val(); var user_id = $(this).find("input[type='checkbox']").val();
$(this).children(".check-item").toggleClass("active"); $(this).toggleClass("active");
if($(this).children(".check-item").hasClass("active")){ if($(this).hasClass("active")){
mail_users.push(user_id); mail_users.push(user_id);
}else{ }else{
mail_users = $.grep(mail_users, function(value) {return value != user_id;}); mail_users = $.grep(mail_users, function(value) {return value != user_id;});