Skip to content

Commit

Permalink
Merge pull request #16852 from opf/bugfix/58129-500-error-when-creati…
Browse files Browse the repository at this point in the history
…ng-status-with-empty-percent-complete-field

[58129] Make Status % Complete a required field
  • Loading branch information
mrmir authored Sep 30, 2024
2 parents 1156805 + 0d27c12 commit 8d4f7ac
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/models/status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Status < ApplicationRecord
uniqueness: { case_sensitive: false },
length: { maximum: 256 }

validates :default_done_ratio, inclusion: { in: 0..100, allow_nil: true }
validates :default_done_ratio, inclusion: { in: 0..100, allow_nil: false }

validate :default_status_must_not_be_readonly

Expand Down
2 changes: 1 addition & 1 deletion app/views/statuses/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details.

<section class="form--section">
<div class="form--field -required"><%= f.text_field "name", required: true, container_class: "-middle" %></div>
<div class="form--field"><%= f.number_field "default_done_ratio", min: 0, max: 100, container_class: "-xslim" %></div>
<div class="form--field -required"><%= f.number_field "default_done_ratio", required: true, min: 0, max: 100, container_class: "-xslim" %></div>
<div class="form--field"><%= f.check_box "is_closed" %></div>
<% unless @status.is_default? %>
<div class="form--field"><%= f.check_box "is_default" %></div>
Expand Down
56 changes: 56 additions & 0 deletions spec/requests/statuses_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# frozen_string_literal: true

#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# 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.
#
# See COPYRIGHT and LICENSE files for more details.
#++

require "spec_helper"

RSpec.describe "Statuses", :skip_csrf, type: :rails_request do
shared_let(:admin) { create(:admin) }

current_user { admin }

describe "POST /statuses" do
it "creates a new status" do
post statuses_path, params: { status: { name: "New Status" } }

expect(Status.find_by(name: "New Status")).not_to be_nil
expect(response).to redirect_to(statuses_path)
end

context "with empty % Complete" do
it "displays an error" do
post statuses_path, params: { status: { name: "New status", default_done_ratio: "" } }

expect(response).to have_http_status(:success)
expect(response).to render_template("new")
expect(response.body).to include("% Complete must be between 0 and 100.")
end
end
end
end

0 comments on commit 8d4f7ac

Please sign in to comment.