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

Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5

This commit is contained in:
Harry Bomrah 2015-01-20 14:24:17 +05:30
parent 1b4e975548 e616c4b947
commit e1247e6083
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/members_controller.rb
View File

@ -158,7 +158,7 @@ class MembersController < ApplicationController
plugin_datas = plugin_data.where(:is_hidden=>false).desc(:year).collect do |p|
{
"pd_datas" => [{ "data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,plugin.module_app_name.underscore)}'>#{p.create_link}" }]
"pd_datas" => [{ "data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,plugin.module_app_name.underscore)}' target='_blank'>#{p.create_link}" }]
}
end

2
app/views/admin/member_selects/select_emails.html.erb
View File

@ -39,7 +39,7 @@
<% next if profile.email.nil? %>
<li class="check-item">
<label>
<%= image_tag (profile.avatar.file ? profile.avatar : "menber-pic.png"), class: "user-pic" %>
<%= image_tag (profile.avatar.file ? profile.avatar : "member-pic.png"), class: "user-pic" %>
<span class="user-name"><%= profile.name %></span>
</label>
<%= check_box_tag 'email_user_ids[]', profile.id , false %>