- <%= styled_label_tag 'to_do_action_reassign', l(:text_reassign) %>
-
-
- <%= styled_submit_tag l(:button_apply), class: '-highlight' %>
+
+ <%= styled_button_tag title: l(:button_delete), class: '-highlight' do
+ concat content_tag :i, '', class: 'button--icon icon-delete'
+ concat content_tag :span, l(:button_delete), class: 'button--text'
+ end %>
+
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2c3113aa46..67bb19f304 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1320,6 +1320,14 @@ en:
permission_view_wiki_edits: "View wiki history"
permission_view_wiki_pages: "View wiki"
+ project:
+ destroy:
+ confirmation: "If you continue, the project %{identifier} and all related data will be permanently destroyed."
+ info: "Deleting the project is an irreversible action."
+ project_verification: "Enter the project's name %{name} to verify the deletion."
+ subprojects_confirmation: "Its subproject(s): %{value} will also be deleted."
+ title: "Do you really want to delete the project %{name}?"
+
project_module_activity: "Activity"
project_module_boards: "Forums"
project_module_calendar: "Calendar"
@@ -1365,10 +1373,11 @@ en:
create_successful: "The repository has been registered."
delete_sucessful: "The repository has been deleted."
destroy:
- title: "Are you absolutely sure?"
- managed_text: "If you continue, this will permanently delete the managed repository of %{project_name}. This action cannot be reverted."
- managed_path_note: "The following directory will be erased: %{path}"
+ confirmation: "If you continue, this will permanently delete the managed repository of %{project_name}."
+ info: "Deleting the repository is an irreversible action."
linked_text: "You're about to remove the linked repository %{url} from the project %{project_name}.\nNote: This will NOT delete the contents of this repository, as it is not managed by OpenProject."
+ managed_path_note: "The following directory will be erased: %{path}"
+ title: "Do you really want to delete the repository %{name}?"
errors:
build_failed: "Unable to create the repository with the selected configuration. %{reason}"
empty_repository: "The repository exists, but is empty. It does not contain any revisions yet."
@@ -1587,16 +1596,13 @@ en:
text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
text_plugin_assets_writable: "Plugin assets directory writable"
text_powered_by: "Powered by %{link}"
- text_project_destroy_title: "Do you really want to delete this project?"
- text_project_destroy_confirmation: "If you continue, the project %{identifier} and all related data will be permanently destroyed. Please check the box below if you want to continue."
text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter."
- text_reassign: "Reassign to"
+ text_reassign: "Reassign to work package:"
text_reassign_to: "work package:"
text_regexp_info: "eg. ^[A-Z0-9]+$"
text_repository_usernames_mapping: "Select or update the OpenProject user mapped to each username found in the repository log.\nUsers with the same OpenProject and repository username or email are automatically mapped."
text_select_mail_notifications: "Select actions for which email notifications should be sent."
text_status_changed_by_changeset: "Applied in changeset %{value}."
- text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted."
text_time_logged_by_changeset: "Applied in changeset %{value}."
text_tip_work_package_begin_day: "work package beginning this day"
text_tip_work_package_begin_end_day: "work package beginning and ending this day"
@@ -1877,6 +1883,9 @@ en:
work_package:
updated_automatically_by_child_changes: |
_Updated automatically by changing values within child work package %{child}_
+ destroy:
+ info: "Deleting the work package is an irreversible action."
+ title: "Do you really want to delete the work package?"
nothing_to_preview: "Nothing to preview"
diff --git a/doc/apiv3-documentation.apib b/doc/apiv3-documentation.apib
index 35b952ecdc..eaecd68741 100644
--- a/doc/apiv3-documentation.apib
+++ b/doc/apiv3-documentation.apib
@@ -545,13 +545,15 @@ a client should be able to discover further resources in the API.
*Note: Currently there is no list action for projects available.*
*A client will therefore have to know links to projects and can't (yet) discover them.*
-| Link | Description | Type | Nullable | Supported operations |
-|:-------------------:| ------------------------------------------------ | ------------- | -------- | -------------------- |
-| configuration | The configuration of this OpenProject instance | Configuration | | READ |
-| priorities | List of available priorities | Collection | | READ |
-| statuses | List of available work package statuses | Collection | | READ |
-| types | List of available work package types | Collection | | READ |
-| workPackages | List of all work packages | Collection | | READ |
+| Link | Description | Type | Nullable | Supported operations | Condition |
+|:-------------------:| ------------------------------------------------ | --------------- | -------- | -------------------- | --------- |
+| configuration | The configuration of this OpenProject instance | Configuration | | READ | |
+| user | The user currently logged-in | User | | READ | logged in |
+| userPreferences | The preferences of the logged-in user | UserPreference | | READ | logged in |
+| priorities | List of available priorities | Collection | | READ | |
+| statuses | List of available work package statuses | Collection | | READ | |
+| types | List of available work package types | Collection | | READ | |
+| workPackages | List of all work packages | Collection | | READ | |
## Local Properties
@@ -570,6 +572,13 @@ a client should be able to discover further resources in the API.
"configuration" : {
"href" : "/api/v3/configuration"
},
+ "user": {
+ "href": "/api/v3/users/1",
+ "title": "John Sheppard - admin"
+ };
+ "userPreferences" : {
+ "href" : "/api/v3/my_preferences"
+ },
"priorities" : {
"href" : "/api/v3/priorities"
},
@@ -3153,6 +3162,121 @@ Permanently deletes the specified user account.
"message": "The specified user does not exist."
}
+# Group UserPreferences
+
+## Linked Properties
+| Link | Description | Type | Constraints | Supported operations |
+|:---------:|----------------------------------------------------------| -------------- | --------------------- | -------------------- |
+| self | This UserPreferences | UserPreferences| not null | READ |
+| user | The user that this preference belongs to | User | not null | READ |
+
+## Local Properties
+| Property | Description | Type | Constraints | Supported operations |
+|:----------------------:| -----------------------------------------------------------| ---------- | ----------- | -------------------- |
+| hideMail | Hide mail address from other users | Boolean | | READ / WRITE |
+| timeZone | Current selected time zone | String | | READ / WRITE |
+| theme | Current selected theme | String | | READ / WRITE |
+| commentSortDescending | Sort comments in descending order | Boolean | | READ / WRITE |
+| warnOnLeavingUnsaved | Issue warning when leaving a page with unsaved text | Boolean | | READ / WRITE |
+| accessibilityMode | Enable accessibility mode | Boolean | | READ / WRITE |
+
+## UserPreferences [/api/v3/my_preferences]
+
++ Model
+ + Body
+
+ {
+ "_type" : "UserPreferences",
+ "_links" : {
+ "self" : {
+ "href" : "/api/v3/my_preferences",
+ },
+ "user": {
+ "href": "/api/v3/users/1",
+ "title": "John Sheppard"
+ }
+ },
+ "hideMail" : false,
+ "timeZone" : "Europe/Berlin",
+ "theme" : "OpenProject",
+ "commentSortDescending" : true,
+ "warnOnLeavingUnsaved" : true,
+ "accessibilityMode" : false
+ }
+
+
+## Show my preferences [GET]
+
++ Response 200 (application/hal+json)
+
+ [UserPreferences][]
+
++ Response 401 (application/hal+json)
+
+ Returned if no user is currently authenticated
+
+ + Body
+
+ {
+ "_type": "Error",
+ "errorIdentifier": "urn:openproject-org:api:v3:errors:Unauthenticated",
+ "message": "You need to be authenticated to access this resource."
+ }
+
+## Update UserPreferences [PATCH]
+
+When calling this endpoint the client provides a single object, containing the properties that it wants to change, in the body.
+
++ Request (application/json)
+
+ {
+ "accessibilityMode": true,
+ "timeZone": "Europe/Paris"
+ }
+
++ Response 200 (application/hal+json)
+
+ [UserPreferences][]
+
++ Response 400 (application/hal+json)
+
+ Occurs when the client did not send a valid JSON object in the request body.
+
+ + Body
+
+ {
+ "_type": "Error",
+ "errorIdentifier": "urn:openproject-org:api:v3:errors:InvalidRequestBody",
+ "message": "The request body was not a single JSON object."
+ }
+
++ Response 401 (application/hal+json)
+
+ Returned if no user is currently authenticated
+
+ + Body
+
+ {
+ "_type": "Error",
+ "errorIdentifier": "urn:openproject-org:api:v3:errors:Unauthenticated",
+ "message": "You need to be authenticated to access this resource."
+ }
+
++ Response 422 (application/hal+json)
+
+ Returned if the update contains invalid properties.
+ Reasons are:
+ * Specifying an invalid type
+ * Using an unknown time zone
+
+ + Body
+
+ {
+ "_type": "Error",
+ "errorIdentifier": "urn:openproject-org:api:v3:errors:PropertyConstraintViolation",
+ "message": "Time zone is not set to one of the allowed values."
+ }
+
# Group Versions
## Linked Properties
diff --git a/features/work_packages/destroy.feature b/features/work_packages/destroy.feature
index 3fbd8d92e0..42f69c8568 100644
--- a/features/work_packages/destroy.feature
+++ b/features/work_packages/destroy.feature
@@ -57,7 +57,7 @@ Feature: Deleting work packages
When I choose "Reassign"
And I fill in the id of work package "wp2" into "work package"
- And I submit the form by the "Apply" button
+ And I submit the form by the "Delete" button
Then I should be on the work packages index page of the project called "ecookbook"
diff --git a/frontend/app/services/version-service.js b/frontend/app/services/version-service.js
index 592844b4c2..45685cd007 100644
--- a/frontend/app/services/version-service.js
+++ b/frontend/app/services/version-service.js
@@ -30,7 +30,6 @@ module.exports = function($http, PathHelper) {
var VersionService = {
- // TODO: check if code invoked anywere
getVersions: function(projectIdentifier) {
var url;
@@ -46,7 +45,9 @@ module.exports = function($http, PathHelper) {
doQuery: function(url, params) {
return $http.get(url, { params: params })
.then(function(response){
- return _.sortBy(response.data.versions, 'name');
+ return _.sortBy(response.data.versions, function(version) {
+ return version.name.toLowerCase();
+ });
});
}
};
diff --git a/frontend/app/work_packages/services/work-package-field-configuration-service.js b/frontend/app/work_packages/services/work-package-field-configuration-service.js
index 271fbe528f..2b9bda5a96 100644
--- a/frontend/app/work_packages/services/work-package-field-configuration-service.js
+++ b/frontend/app/work_packages/services/work-package-field-configuration-service.js
@@ -32,7 +32,9 @@ module.exports = function() {
switch(field) {
case 'version':
- sorting = 'title';
+ sorting = function(field) {
+ return field.title.toLowerCase();
+ };
break;
default:
sorting = null;
diff --git a/spec/features/projects/delete_projects_spec.rb b/spec/features/projects/delete_projects_spec.rb
index 005eed7f67..d8fae08c50 100644
--- a/spec/features/projects/delete_projects_spec.rb
+++ b/spec/features/projects/delete_projects_spec.rb
@@ -29,11 +29,10 @@
require 'spec_helper'
require 'features/projects/projects_page'
-describe 'Delete project', type: :feature do
+describe 'Delete project', type: :feature, js: true do
let(:current_user) { FactoryGirl.create (:admin) }
let(:project) { FactoryGirl.create(:project) }
let(:projects_page) { ProjectsPage.new(project) }
- let(:delete_button) { find('input[type="submit"]') }
before do
allow(User).to receive(:current).and_return current_user
@@ -41,23 +40,23 @@ describe 'Delete project', type: :feature do
projects_page.visit_confirm_destroy
end
- it { expect(find('input#confirm')).not_to be_nil }
-
- describe 'click delete w/o confirm' do
- before do delete_button.click end
-
- it { expect(find('.error', text: I18n.t(:notice_project_not_deleted))).not_to be_nil }
+ describe 'disable delete w/o confirm' do
+ it { expect(page).to have_css('.danger-zone .button[disabled]') }
end
- describe 'click delete with confirm' do
- let(:confirm_checkbox) { find('input#confirm') }
-
- before do
- confirm_checkbox.set true
-
- delete_button.click
+ describe 'disable delete with wrong input' do
+ let(:input) { find('.danger-zone input') }
+ it do
+ input.set 'Not the project name'
+ expect(page).to have_css('.danger-zone .button[disabled]')
end
+ end
- it { expect(find('h2', text: 'Projects')).not_to be_nil }
+ describe 'enable delete with correct input' do
+ let(:input) { find('.danger-zone input') }
+ it do
+ input.set project.name
+ expect(page).to have_css('.danger-zone .button:not([disabled])')
+ end
end
end
diff --git a/spec/features/repositories/repository_settings_spec.rb b/spec/features/repositories/repository_settings_spec.rb
index dcacb6cb67..923f2d0e2a 100644
--- a/spec/features/repositories/repository_settings_spec.rb
+++ b/spec/features/repositories/repository_settings_spec.rb
@@ -62,9 +62,13 @@ describe 'Repository Settings', type: :feature, js: true do
find('a.icon-delete', text: I18n.t(:button_delete)).click
# Confirm the notification warning
- warning = (type == 'managed') ? '-warning.-severe' : '-warning'
- expect(page).to have_selector(".notification-box.#{warning}")
- find('a', text: I18n.t(:button_delete)).click
+ if type == 'managed'
+ expect(page).to have_selector('form.danger-zone')
+ find('.danger-zone .button').click
+ else
+ expect(page).to have_selector('.notification-box.-warning')
+ find('a', text: I18n.t(:button_delete)).click
+ end
vendor = find('select[name="scm_vendor"]')
expect(vendor).not_to be_nil
diff --git a/spec/models/version_spec.rb b/spec/models/version_spec.rb
index 887c7ac558..988e859585 100644
--- a/spec/models/version_spec.rb
+++ b/spec/models/version_spec.rb
@@ -127,6 +127,49 @@ describe Version, type: :model do
expect(version1 <=> version2).to eql 1
end
+
+ it 'is 0 if name and project are equal except for case' do
+ version1.project.name = version2.project.name.upcase
+ version1.name = version2.name.upcase
+
+ expect(version1 <=> version2).to be 0
+ end
+
+ it "is -1 if the project name is alphabetically before the other's project name ignoring case" do
+ version1.name = 'BBBB'
+ version1.project.name = 'aaaa'
+ version2.name = 'AAAA'
+ version2.project.name = 'BBBB'
+
+ expect(version1 <=> version2).to eql -1
+ end
+
+ it "is 1 if the project name is alphabetically after the other's project name ignoring case" do
+ version1.name = 'AAAA'
+ version1.project.name = 'BBBB'
+ version2.name = 'BBBB'
+ version2.project.name = 'aaaa'
+
+ expect(version1 <=> version2).to eql 1
+ end
+
+ it "is -1 if the project name is equal
+ and the version's name is alphabetically before the other's name ignoring case" do
+ version1.project.name = version2.project.name
+ version1.name = 'aaaa'
+ version2.name = 'BBBB'
+
+ expect(version1 <=> version2).to eql -1
+ end
+
+ it "is 1 if the project name is equal
+ and the version's name is alphabetically after the other's name ignoring case" do
+ version1.project.name = version2.project.name
+ version1.name = 'BBBB'
+ version2.name = 'aaaa'
+
+ expect(version1 <=> version2).to eql 1
+ end
end
context '#projects' do