Skip to content

Commit

Permalink
Merge pull request #16155 from opf/feature/55803-status-based-progres…
Browse files Browse the repository at this point in the history
…s-mode-allow-users-to-freely-input-%-complete-values-for-statuses

[55803] Allow free input of status % complete in administration
  • Loading branch information
dombesz authored Jul 17, 2024
2 parents 0e21762 + 599c031 commit d581070
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 41 deletions.
7 changes: 1 addition & 6 deletions app/views/statuses/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +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.select :default_done_ratio,
(0..100).step(10).map { |r| ["#{r} %", r] },
container_class: "-xslim",
label: WorkPackage.human_attribute_name(:done_ratio) %>
</div>
<div class="form--field"><%= f.number_field "default_done_ratio", 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
74 changes: 39 additions & 35 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -671,17 +671,6 @@ en:
attribute_help_text:
attribute_name: "Attribute"
help_text: "Help text"
ldap_auth_source:
account: "Account"
attr_firstname: "Firstname attribute"
attr_lastname: "Lastname attribute"
attr_login: "Username attribute"
attr_mail: "Email attribute"
base_dn: "Base DN"
host: "Host"
onthefly: "Automatic user creation"
port: "Port"
tls_certificate_string: "LDAP server SSL certificate"
changeset:
repository: "Repository"
color:
Expand All @@ -706,6 +695,14 @@ en:
visible: "Visible"
custom_value:
value: "Value"
doorkeeper/application:
uid: "Client ID"
secret: "Client secret"
owner: "Owner"
redirect_uri: "Redirect URI"
client_credentials_user_id: "Client Credentials User ID"
scopes: "Scopes"
confidential: "Confidential"
enterprise_token:
starts_at: "Valid since"
subscriber: "Subscriber"
Expand All @@ -716,20 +713,25 @@ en:
row_count: "Number of rows"
column_count: "Number of columns"
widgets: "Widgets"
oauth_client:
client: "Client ID"
relation:
lag: "Lag"
from: "Work package"
to: "Related work package"
status:
is_closed: "Work package closed"
is_readonly: "Work package read-only"
excluded_from_totals: "Exclude from calculation of totals in hierarchy"
journal:
notes: "Notes"
ldap_auth_source:
account: "Account"
attr_firstname: "Firstname attribute"
attr_lastname: "Lastname attribute"
attr_login: "Username attribute"
attr_mail: "Email attribute"
base_dn: "Base DN"
host: "Host"
onthefly: "Automatic user creation"
port: "Port"
tls_certificate_string: "LDAP server SSL certificate"
member:
roles: "Roles"
oauth_client:
client: "Client ID"
planning_element_type_color:
hexcode: Hex code
project:
active_value:
true: "unarchived"
Expand Down Expand Up @@ -759,17 +761,28 @@ en:
types: "Types"
versions: "Versions"
work_packages: "Work Packages"
project_custom_field:
custom_field_section: Section
query:
column_names: "Columns"
relations_to_type_column: "Relations to %{type}"
relations_of_type_column: "%{type} relations"
group_by: "Group results by"
filters: "Filters"
timeline_labels: "Timeline labels"
relation:
lag: "Lag"
from: "Work package"
to: "Related work package"
repository:
url: "URL"
role:
permissions: "Permissions"
status:
is_closed: "Work package closed"
is_readonly: "Work package read-only"
excluded_from_totals: "Exclude from calculation of totals in hierarchy"
default_done_ratio: "% Complete"
time_entry:
activity: "Activity"
hours: "Hours"
Expand Down Expand Up @@ -812,10 +825,6 @@ en:
wiki_page:
parent_title: "Parent page"
redirect_existing_links: "Redirect existing links"
planning_element_type_color:
hexcode: Hex code
project_custom_field:
custom_field_section: Section
work_package:
begin_insertion: "Begin of the insertion"
begin_deletion: "Begin of the deletion"
Expand Down Expand Up @@ -850,14 +859,6 @@ en:
type: "Type"
version: "Version"
watcher: "Watcher"
"doorkeeper/application":
uid: "Client ID"
secret: "Client secret"
owner: "Owner"
redirect_uri: "Redirect URI"
client_credentials_user_id: "Client Credentials User ID"
scopes: "Scopes"
confidential: "Confidential"

errors:
messages:
Expand Down Expand Up @@ -1071,6 +1072,11 @@ en:
hours_per_day_are_missing: "The number of hours per day must be defined."
durations_are_not_positive_numbers: "The durations must be positive numbers."
hours_per_day_is_out_of_bounds: "Hours per day can't be more than 24"
status:
attributes:
default_done_ratio:
inclusion: "must be between 0 and 100."
readonly_default_exlusive: "can not be activated for statuses that are marked default."
time_entry:
attributes:
hours:
Expand Down Expand Up @@ -1185,8 +1191,6 @@ en:
version:
undeletable_archived_projects: "The version cannot be deleted as it has work packages attached to it."
undeletable_work_packages_attached: "The version cannot be deleted as it has work packages attached to it."
status:
readonly_default_exlusive: "can not be activated for statuses that are marked default."
token/api:
attributes:
token_name:
Expand Down

0 comments on commit d581070

Please sign in to comment.