jro_apps/redmine Commit - r9942:1e6938a1197b

Removed duplicate ids....

Jean-Philippe Lang -

r9942:1e6938a1197b

parent child

Context file:

r9942:1e6938a1197b

Collapse all files

app/helpers/settings_helper.rb +4 -3

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             module SettingsHelper
               def administration_settings_tabs
                 tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
                         {:name => 'display', :partial => 'settings/display', :label => :label_display},
                         {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
                         {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
                         {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
                         {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},
                         {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails},
                         {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
                         ]
               end
               def setting_select(setting, choices, options={})
                 if blank_text = options.delete(:blank)
                   choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices
                 end
                 setting_label(setting, options).html_safe +
                   select_tag("settings[#{setting}]",
                              options_for_select(choices, Setting.send(setting).to_s),
                              options).html_safe
               end
               def setting_multiselect(setting, choices, options={})
                 setting_values = Setting.send(setting)
                 setting_values = [] unless setting_values.is_a?(Array)
                 setting_label(setting, options).html_safe +
                   hidden_field_tag("settings[#{setting}][]", '').html_safe +
                   choices.collect do |choice|
                     text, value = (choice.is_a?(Array) ? choice : [choice, choice])
                     content_tag(
                       'label',
                       check_box_tag(
                          "settings[#{setting}][]",
                          value,
-                         Setting.send(setting).include?(value)
+                         Setting.send(setting).include?(value),
+                         :id => nil
                        ) + text.to_s,
                       :class => 'block'
                      )
                   end.join.html_safe
               end
               def setting_text_field(setting, options={})
                 setting_label(setting, options).html_safe +
                   text_field_tag("settings[#{setting}]", Setting.send(setting), options).html_safe
               end
               def setting_text_area(setting, options={})
                 setting_label(setting, options).html_safe +
                   text_area_tag("settings[#{setting}]", Setting.send(setting), options).html_safe
               end
               def setting_check_box(setting, options={})
                 setting_label(setting, options).html_safe +
-                  hidden_field_tag("settings[#{setting}]", 0).html_safe +
+                  hidden_field_tag("settings[#{setting}]", 0, :id => nil).html_safe +
                     check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options).html_safe
               end
               def setting_label(setting, options={})
                 label = options.delete(:label)
                 label != false ? content_tag("label", l(label || "setting_#{setting}")).html_safe : ''
               end
               # Renders a notification field for a Redmine::Notifiable option
               def notification_field(notifiable)
                 return content_tag(:label,
                                    check_box_tag('settings[notified_events][]',
                                                  notifiable.name,
-                                                 Setting.notified_events.include?(notifiable.name)).html_safe +
+                                                 Setting.notified_events.include?(notifiable.name), :id => nil).html_safe +
                                      l_or_humanize(notifiable.name, :prefix => 'label_').html_safe,
                                    :class => notifiable.parent.present? ? "parent" : '').html_safe
               end
             end

app/views/settings/_repositories.html.erb +1 -6

             <%= form_tag({:action => 'edit', :tab => 'repositories'}) do %>
             <fieldset class="box settings enabled_scm">
             <%= hidden_field_tag 'settings[enabled_scm][]', '' %>
             <legend><%= l(:setting_enabled_scm) %></legend>
             <table>
               <tr>
                 <th></th>
                 <th><%= l(:text_scm_command)         %></th>
                 <th><%= l(:text_scm_command_version) %></th>
               </tr>
               <% Redmine::Scm::Base.all.collect do |choice| %>
                 <% scm_class = "Repository::#{choice}".constantize %>
                 <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
                 <% setting = :enabled_scm %>
             		<% enabled = Setting.send(setting).include?(value) %>
                 <tr>
                   <td class="scm_name">
-                    <%=
+                    <%= check_box_tag("settings[#{setting}][]", value, enabled, :id => nil) %>
-                      check_box_tag(
-                          "settings[#{setting}][]",
-                           value,
-                           enabled)
-                     %>
                     <%= text.to_s %>
                   </td>
                   <td>
                      <% if enabled %>
                      <%=
                        image_tag(
                           (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
                           :style => "vertical-align:bottom;"
                        )
                        %>
                       <%= scm_class.scm_command %>
             					<% end %>
                    </td>
                    <td>
                       <%= scm_class.scm_version_string if enabled %>
                    </td>
                  </tr>
               <% end %>
             </table>
             <p><em class="info"><%= l(:text_scm_config) %></em></p>
             </fieldset>
             <div class="box tabular settings">
             <p><%= setting_check_box :autofetch_changesets %></p>
             <p><%= setting_check_box :sys_api_enabled,
                                      :onclick =>
                                          "if (this.checked) { $('#settings_sys_api_key').removeAttr('disabled'); } else { $('#settings_sys_api_key').attr('disabled', true); }" %></p>
             <p><%= setting_text_field :sys_api_key,
                                       :size     => 30,
                                       :id       => 'settings_sys_api_key',
                                       :disabled => !Setting.sys_api_enabled?,
                                       :label    => :setting_mail_handler_api_key %>
               <%= link_to_function l(:label_generate_key),
                                    "if (!$('#settings_sys_api_key').attr('disabled')) { $('#settings_sys_api_key').val(randomKey(20)) }" %>
             </p>
             <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
             </div>
             <fieldset class="box tabular settings">
             <legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
             <p><%= setting_text_field :commit_ref_keywords, :size => 30 %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
             &nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
                                                                       [["", 0]] +
                                                                           IssueStatus.find(:all).collect{
                                                                              |status| [status.name, status.id.to_s]
                                                                           },
                                                                       :label => false %>
             &nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
                                                                    (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
                                                                    :blank => :label_no_change_option,
                                                                    :label => false %>
             <em class="info"><%= l(:text_comma_separated) %></em></p>
             <p><%= setting_check_box :commit_cross_project_ref %></p>
             <p><%= setting_check_box :commit_logtime_enabled,
                                      :onclick =>
                                         "if (this.checked) { $('#settings_commit_logtime_activity_id').removeAttr('disabled'); } else { $('#settings_commit_logtime_activity_id').attr('disabled', true); }"%></p>
             <p><%= setting_select :commit_logtime_activity_id,
                                   [[l(:label_default), 0]] +
                                       TimeEntryActivity.shared.active.collect{|activity| [activity.name, activity.id.to_s]},
                                   :disabled => !Setting.commit_logtime_enabled?%></p>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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