jro_apps/redmine Commit - r9435:ad8193dcdeda

1

# Redmine - project management software

1

# Redmine - project management software

2

3

#

3

#

4

# This program is free software; you can redistribute it and/or

4

# This program is free software; you can redistribute it and/or

5

# modify it under the terms of the GNU General Public License

5

# modify it under the terms of the GNU General Public License

6

# as published by the Free Software Foundation; either version 2

6

# as published by the Free Software Foundation; either version 2

7

# of the License, or (at your option) any later version.

7

# of the License, or (at your option) any later version.

8

#

8

#

9

# This program is distributed in the hope that it will be useful,

9

# This program is distributed in the hope that it will be useful,

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12

# GNU General Public License for more details.

12

# GNU General Public License for more details.

13

#

13

#

14

# You should have received a copy of the GNU General Public License

14

# You should have received a copy of the GNU General Public License

15

# along with this program; if not, write to the Free Software

15

# along with this program; if not, write to the Free Software

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

17

18

require 'action_view/helpers/form_helper'

18

require 'action_view/helpers/form_helper'

19

20

class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder

20

class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder

21

include Redmine::I18n

21

include Redmine::I18n

22

23

(field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for) +

23

(field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for) +

24

%w(date_select)).each do |selector|

24

%w(date_select)).each do |selector|

25

src = <<-END_SRC

25

src = <<-END_SRC

26

def #{selector}(field, options = {})

26

def #{selector}(field, options = {})

27

label_for_field(field, options) + super(field, options.except(:label)).html_safe

27

label_for_field(field, options) + super(field, options.except(:label)).html_safe

28

end

28

end

29

END_SRC

29

END_SRC

30

class_eval src, __FILE__, __LINE__

30

class_eval src, __FILE__, __LINE__

31

end

31

end

32

33

def select(field, choices, options = {}, html_options = {})

33

def select(field, choices, options = {}, html_options = {})

34

label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe

34

label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe

35

end

35

end

36

37

# Returns a label tag for the given field

37

# Returns a label tag for the given field

38

def label_for_field(field, options = {})

38

def label_for_field(field, options = {})

39

return ''.html_safe if options.delete(:no_label)

39

return ''.html_safe if options.delete(:no_label)

40

text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]

40

text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]

41

text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)

41

text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)

42

text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)

42

text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)

43

@template.content_tag("label", text.html_safe,

43

@template.content_tag("label", text.html_safe,

44

:class => (@object && @object.errors[field] ? "error" : nil),

44

:class => (@object && @object.errors[field].present? ? "error" : nil),

45

:for => (@object_name.to_s + "_" + field.to_s))

45

:for => (@object_name.to_s + "_" + field.to_s))

46

end

46

end

47

end

47

end

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'action_view/helpers/form_helper'
             class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder
               include Redmine::I18n
               (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for) +
                     %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   label_for_field(field, options) + super(field, options.except(:label)).html_safe
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def select(field, choices, options = {}, html_options = {})
                 label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe
               end
               # Returns a label tag for the given field
               def label_for_field(field, options = {})
                   return ''.html_safe if options.delete(:no_label)
                   text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
                   text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
                   text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
                   @template.content_tag("label", text.html_safe,
-                                                 :class => (@object && @object.errors[field] ? "error" : nil),
+                                                 :class => (@object && @object.errors[field].present? ? "error" : nil),
                                                  :for => (@object_name.to_s + "_" + field.to_s))
               end
             end