gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shift relevant functions to versions_helper

Browse source
This commit is contained in:
Agrim Mittal 2017-03-24 04:12:25 +05:30 • committed by Stella Rouzi
parent b4c2eeb772
commit 255744268b
3 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/paths_helper.rb
View file

@ -2,10 +2,6 @@ module PathsHelper
## ##
# Includes functions related to links or redirects # Includes functions related to links or redirects
## ##
def link_if_alive(version, link_text, link_url)
version.item ? link_to(link_text, link_url) : link_text
end
def link_to_user(user_id) def link_to_user(user_id)
user = User.find_by(id: user_id) user = User.find_by(id: user_id)
if user if user

20
app/helpers/users_helper.rb
View file

@ -27,24 +27,4 @@ module UsersHelper
def show_roles(roles) def show_roles(roles)
roles.map{ |x| x[0].titleize + ' (' + x[1].join(', ') + ')' }.join ', ' roles.map{ |x| x[0].titleize + ' (' + x[1].join(', ') + ')' }.join ', '
end end
def user_change_description(version)
if version.event == 'create'
link_to_user(version.item_id) + ' signed up'
elsif version.event == 'update'
if version.changeset.keys.include?('reset_password_sent_at')
'Someone requested password reset of'
elsif version.changeset.keys.include?('confirmed_at') && version.changeset['confirmed_at'][0].nil?
(version.whodunnit.nil? ? link_to_user(version.item_id) : link_to_user(version.whodunnit)) + ' confirmed account of'
elsif version.changeset.keys.include?('confirmed_at') && version.changeset['confirmed_at'][1].nil?
link_to_user(version.whodunnit) + ' unconfirmed account of'
else
link_to_user(version.whodunnit) + " updated #{updated_attributes(version)} of"
end
end
end
def users_role_change_description(version)
version.event == 'create' ? 'added' : 'removed'
end
end end

8
spec/helpers/format_helper_spec.rb
View file

@ -8,11 +8,9 @@ describe FormatHelper, type: :helper do
end end
it 'should return HTML for header markdown' do it 'should return HTML for header markdown' do
expect(Redcarpet::Markdown).to receive(:new). expect(Redcarpet::Markdown).to receive(:new)
with(Redcarpet::Render::HTML, autolink: true, .with(Redcarpet::Render::HTML, autolink: true, space_after_headers: true, no_intra_emphasis: true)
space_after_headers: true, .and_call_original
no_intra_emphasis: true).
and_call_original
expect(markdown('# this is my header')).to eq "<h1>this is my header</h1>\n" expect(markdown('# this is my header')).to eq "<h1>this is my header</h1>\n"
end end