Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[27406] Rename responsible to accountable #6482

Merged
merged 2 commits into from Aug 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
132 changes: 0 additions & 132 deletions app/controllers/project_types_controller.rb

This file was deleted.

9 changes: 0 additions & 9 deletions app/controllers/projects_controller.rb
Expand Up @@ -40,7 +40,6 @@ class ProjectsController < ApplicationController
before_action :require_admin, only: [:archive, :unarchive, :destroy, :destroy_info]
before_action :jump_to_project_menu_item, only: :show
before_action :load_project_settings, only: :settings
before_action :determine_base

accept_key_auth :index, :level_list, :show, :create, :update, :destroy

Expand Down Expand Up @@ -303,14 +302,6 @@ def filter_projects_by_permission(projects)

protected

def determine_base
@base = if params[:project_type_id]
ProjectType.find(params[:project_type_id]).projects
else
Project
end
end

def set_sorting(query)
orders = query.orders.select(&:valid?).map { |o| [o.attribute.to_s, o.direction.to_s] }

Expand Down
4 changes: 0 additions & 4 deletions app/helpers/projects_helper.rb
Expand Up @@ -120,10 +120,6 @@ def format_version_sharing(sharing)
l("label_version_sharing_#{sharing}")
end

def options_for_project_types
ProjectType.all.map { |t| [t.name, t.id] }
end

def filter_set?
params[:filters].present?
end
Expand Down
8 changes: 0 additions & 8 deletions app/models/permitted_params.rb
Expand Up @@ -130,18 +130,10 @@ def member
params.require(:member).permit(*self.class.permitted_attributes[:member])
end

def project_type
params.require(:project_type).permit(*self.class.permitted_attributes[:project_type])
end

def projects_type_ids
params.require(:project).require(:type_ids).map(&:to_i).select { |x| x > 0 }
end

def project_type_move
params.require(:project_type).permit(*self.class.permitted_attributes[:move_to])
end

def query
# there is a weird bug in strong_parameters gem which makes the permit call
# on the sort_criteria pattern return the sort_criteria-hash contents AND
Expand Down
6 changes: 0 additions & 6 deletions app/models/project.rb
Expand Up @@ -179,12 +179,6 @@ class Project < ActiveRecord::Base
scope :visible, ->(user = User.current) { Project.visible_by(user) }
scope :newest, -> { order(created_on: :desc) }

# timelines stuff

belongs_to :project_type, class_name: '::ProjectType'

belongs_to :responsible, class_name: 'User'

def visible?(user = User.current)
self.active? and (self.is_public? or user.admin? or user.member_of?(self))
end
Expand Down
49 changes: 0 additions & 49 deletions app/models/project_type.rb

This file was deleted.

2 changes: 1 addition & 1 deletion app/models/type/attributes.rb
Expand Up @@ -143,7 +143,7 @@ def attr_translate(name)
I18n.t('label_date')
else
key = attr_i18n_key(name)
I18n.t("activerecord.attributes.work_package.#{key}", default: '')
I18n.t("activerecord.attributes.work_package.#{key}", fallback: false, default: '')
.presence || I18n.t("attributes.#{key}")
end
end
Expand Down
3 changes: 0 additions & 3 deletions app/models/user.rb
Expand Up @@ -67,9 +67,6 @@ class User < Principal
has_many :responsible_for_issues, foreign_key: 'responsible_id',
class_name: 'WorkPackage',
dependent: :nullify
has_many :responsible_for_projects, foreign_key: 'responsible_id',
class_name: 'Project',
dependent: :nullify
has_many :watches, class_name: 'Watcher',
dependent: :delete_all
has_many :changesets, dependent: :nullify
Expand Down
62 changes: 0 additions & 62 deletions app/seeders/basic_data/project_type_seeder.rb

This file was deleted.

16 changes: 0 additions & 16 deletions app/seeders/basic_data/workflow_seeder.rb
Expand Up @@ -53,22 +53,6 @@ def seed_data!
is_in_roadmap: true,
is_milestone: false)

# Adds the standard type to all existing projects
#
# As this seed might be executed on an existing database, there might be projects
# that do not have the default type yet.

condition = "NOT EXISTS
(SELECT * from projects_types
WHERE projects.id = projects_types.project_id
AND projects_types.type_id = #{standard_type.id})"

projects_without_standard_type = Project.where(condition).all

projects_without_standard_type.each do |project|
project.types << standard_type
end

[WorkPackage, Journal::WorkPackageJournal].each do |klass|
klass.where(type_id: nil).update_all(type_id: standard_type.id)
end
Expand Down
1 change: 0 additions & 1 deletion app/seeders/basic_data_seeder.rb
Expand Up @@ -35,7 +35,6 @@ def data_seeder_classes
BasicData::ColorSeeder,
BasicData::WorkflowSeeder,
BasicData::PrioritySeeder,
BasicData::ProjectTypeSeeder,
BasicData::SettingSeeder
]
end
Expand Down