byterazor/redmine_glossary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[phase-16]improve error message

Browse Source
This commit is contained in:
Toru Takahashi 2018-06-23 21:18:31 +09:00 committed by TAKAHASHI,Toru
parent 32a3149ca9
commit 4fbac95ee1
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/glossary_macros.rb
View File

@ -4,15 +4,33 @@ module GlossaryMacros
desc "create macro which links to glossary term by id."
macro :termno do |obj, args|
term_id = args.first
term = GlossaryTerm.find(term_id)
link_to term.name, project_glossary_term_path(@project, term)
begin
raise 'no parameters' if args.count.zero?
raise 'too many parameters' if args.count > 1
term_id = args.first
term = GlossaryTerm.find(term_id)
link_to term.name, project_glossary_term_path(@project, term)
rescue => err_msg
raise <<-TEXT.html_safe
Parameter error: #{err_msg}<br>
Usage: {{termno(glossary_term_id)}}
TEXT
end
end
desc "create macro which links to glossary term by name."
macro :term do |obj, args|
term = GlossaryTerm.find_by(name: args.first)
link_to term.name, project_glossary_term_path(@project, term)
begin
raise 'no parameters' if args.count.zero?
raise 'too many parameters' if args.count > 1
term = GlossaryTerm.find_by!(name: args.first)
link_to term.name, project_glossary_term_path(@project, term)
rescue => err_msg
raise <<-TEXT.html_safe
Parameter error: #{err_msg}<br>
Usage: {{term(name)}}
TEXT
end
end
end