Project

General

Profile

Defect #33930 » 33930.diff

Kevin Fischer, 2020-09-21 10:25

View differences:

app/views/custom_field_enumerations/create.js.erb
1
$('#errorExplanation').remove();
2

  
3
<% if @value.valid? %>
1 4
$('#content').html('<%= escape_javascript(render(:template => 'custom_field_enumerations/index')) %>');
5
<% else %>
6
$('form#add-element').prepend('<%= escape_javascript(error_messages_for(@value)) %>');
7
<% end %>
8

  
2 9
$('#custom_field_enumeration_name').focus();
app/views/custom_field_enumerations/index.html.erb
26 26
<% end %>
27 27
<% end %>
28 28

  
29
<p><%= l(:label_enumeration_new) %></p>
29
<%= form_tag custom_field_enumerations_path(@custom_field), :method => 'post', :remote => true, id: 'add-element' do %>
30
  <p><%= l(:label_enumeration_new) %></p>
30 31

  
31
<%= form_tag custom_field_enumerations_path(@custom_field), :method => 'post', :remote => true do %>
32 32
  <p><%= text_field_tag 'custom_field_enumeration[name]', '', :size => 40 %>
33 33
  <%= submit_tag(l(:button_add)) %></p>
34 34
<% end %>
test/system/custom_field_enumerations_test.rb
1
# frozen_string_literal: true
2

  
3
# Redmine - project management software
4
# Copyright (C) 2006-2020  Jean-Philippe Lang
5
#
6
# This program is free software; you can redistribute it and/or
7
# modify it under the terms of the GNU General Public License
8
# as published by the Free Software Foundation; either version 2
9
# of the License, or (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful,
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
# GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
19

  
20
require File.expand_path('../../application_system_test_case', __FILE__)
21

  
22
class CustomFieldEnumerationsTest < ApplicationSystemTestCase
23
  fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
24
           :trackers, :projects_trackers, :enabled_modules, :issue_statuses, :issues,
25
           :enumerations, :custom_fields, :custom_values, :custom_fields_trackers,
26
           :watchers, :journals, :journal_details
27

  
28
  def test_add_empty_value
29
    custom_field = IssueCustomField.generate!(field_format: 'enumeration')
30
    log_user('admin', 'admin')
31
    visit "custom_fields/#{custom_field.id}/enumerations"
32

  
33
    click_on 'Add'
34
    assert page.has_css?('#errorExplanation', text: 'Name cannot be blank')
35
  end
36
end
(1-1/2)