">
- | <%= link_to custom_field.name, edit_table_field_path(custom_field, custom_table_id: @custom_table.id), remote: true %> |
+ <%= link_to custom_field.name, edit_table_field_path(custom_field, custom_table_id: @custom_table.id, back_url: back_url), remote: true %> |
<%= l(custom_field.format.label) %> |
<%= checked_image custom_field.is_required? %> |
<%= f.radio_button :main_custom_field_id, custom_field.id %> |
<%= reorder_handle(custom_field, url: custom_field_path(custom_field), param: 'custom_field') %>
- <%= link_to l(:button_edit), edit_table_field_path(id: custom_field), remote: true, title: l(:button_edit), class: 'icon-only icon-edit' %>
- <%= delete_link table_field_path(custom_field, custom_table_id: @custom_table.id), class: 'icon-only icon-del' %>
+ <%= link_to l(:button_edit), edit_table_field_path(id: custom_field, back_url: back_url), remote: true, title: l(:button_edit), class: 'icon-only icon-edit' %>
+ <%= delete_link table_field_path(custom_field, custom_table_id: @custom_table.id, back_url: back_url), class: 'icon-only icon-del' %>
|
<% end; reset_cycle %>
diff --git a/app/views/table_fields/edit.html.erb b/app/views/table_fields/edit.html.erb
index bb2044f..fc19f9b 100644
--- a/app/views/table_fields/edit.html.erb
+++ b/app/views/table_fields/edit.html.erb
@@ -1,5 +1,5 @@
<%= labelled_form_for :custom_field, @custom_field, url: table_field_path(@custom_field), html: {method: :put, id: 'custom_field_form'} do |f| %>
- <%= hidden_field_tag :back_url, edit_custom_table_path(@custom_field.custom_table) %>
+ <%= hidden_field_tag :back_url, params[:back_url] %>
<%= hidden_field_tag :tab, @tab || params[:tab] %>
<%= render partial: 'form', locals: {f: f} %>
<% end %>
\ No newline at end of file
diff --git a/app/views/table_fields/new.html.erb b/app/views/table_fields/new.html.erb
index b7199cc..d08d20d 100644
--- a/app/views/table_fields/new.html.erb
+++ b/app/views/table_fields/new.html.erb
@@ -1,4 +1,3 @@
-
<%= labelled_form_for :custom_field, @custom_field, url: table_fields_path, html: {id: 'custom_field_form'} do |f| %>
<%= render partial: 'form', locals: {f: f} %>
<%= hidden_field_tag :type, @custom_field.type %>
diff --git a/db/migrate/20190820221144_add_tracker_ids_to_custom_table.rb b/db/migrate/20190820221144_add_tracker_ids_to_custom_table.rb
new file mode 100644
index 0000000..d743ca0
--- /dev/null
+++ b/db/migrate/20190820221144_add_tracker_ids_to_custom_table.rb
@@ -0,0 +1,16 @@
+class AddTrackerIdsToCustomTable < ActiveRecord::Migration[5.2]
+ def change
+ create_table :custom_tables_trackers, id: false do |t|
+ t.belongs_to :custom_table
+ t.belongs_to :tracker
+ end
+
+ create_table :custom_tables_roles, id: false do |t|
+ t.belongs_to :custom_table
+ t.belongs_to :role
+ end
+
+ add_column :custom_tables, :description, :text
+ add_column :custom_tables, :visible, :boolean, null: false, default: true
+ end
+end
diff --git a/lib/custom_tables/patches/project_patch.rb b/lib/custom_tables/patches/project_patch.rb
index 9cc85ca..204f0d7 100644
--- a/lib/custom_tables/patches/project_patch.rb
+++ b/lib/custom_tables/patches/project_patch.rb
@@ -8,10 +8,13 @@ module CustomTables
# Returns a scope of all custom tables enabled for project issues
# (explicitly associated custom tables and custom tables enabled for all projects)
- def all_issue_custom_tables
- CustomTable.
+ def all_issue_custom_tables(issue)
+ @custom_tables ||= CustomTable.
+ joins(:trackers).
+ visible.
sorted.
- where("is_for_all = ? OR id IN (?)", true, custom_table_ids)
+ where("custom_tables.is_for_all = ? OR custom_tables.id IN (?)", true, custom_table_ids).
+ where(trackers: {id: issue.tracker})
end
end
diff --git a/spec/factories/factories.rb b/spec/factories/factories.rb
index 7ede074..6955749 100644
--- a/spec/factories/factories.rb
+++ b/spec/factories/factories.rb
@@ -98,7 +98,53 @@ FactoryBot.define do
tracker { project.trackers.first }
start_date { Date.today }
due_date { Date.today + 7.days }
+ priority { IssuePriority.default || FactoryBot.create(:issue_priority, :default) }
association :status, factory: :issue_status
association :author, :factory => :user, :firstname => "Author"
end
+
+ factory :enumeration do
+ name { 'Test' }
+
+ trait :default do
+ name { 'Default' }
+ is_default { true }
+ end
+ end
+
+ factory :role do
+ sequence(:name){ |n| "Role ##{n}" }
+ permissions { Role.new.setable_permissions.collect(&:name).uniq }
+ end
+
+ factory :issue_priority, parent: :enumeration, class: 'IssuePriority' do
+ sequence(:name){ |n| "Priority ##{n}" }
+ end
+
+ factory :member_role do
+ role
+ member
+ end
+
+ factory :member do
+ project
+ user
+ roles { [] }
+
+ after :build do |member, evaluator|
+ if evaluator.roles.empty?
+ member.member_roles << FactoryBot.build(:member_role, member: member)
+ else
+ evaluator.roles.each do |role|
+ member.member_roles << FactoryBot.build(:member_role, member: member, role: role)
+ end
+ end
+ end
+
+ trait :without_roles do
+ after :create do |member, evaluator|
+ member.member_roles.clear
+ end
+ end
+ end
end
diff --git a/spec/models/custom_table_spec.rb b/spec/models/custom_table_spec.rb
new file mode 100644
index 0000000..07cc41f
--- /dev/null
+++ b/spec/models/custom_table_spec.rb
@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe CustomTable, type: :model do
+
+ let(:role) { FactoryBot.create(:role) }
+ let(:member) { FactoryBot.create(:member) }
+ let(:user) { FactoryBot.create(:user, memberships: [member]) }
+ let(:custom_table) { FactoryBot.create(:custom_table, visible: false, roles: user.roles) }
+
+ describe 'visible' do
+
+ it 'when table is visible' do
+ expect(CustomTable.visible(user)).to include custom_table
+ end
+
+ context 'should be invisible' do
+ let(:user) { FactoryBot.create(:user) }
+ it 'user is not member' do
+ expect(CustomTable.visible(user)).not_to include custom_table
+ end
+ end
+
+ end
+end
\ No newline at end of file
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
new file mode 100644
index 0000000..cb33e01
--- /dev/null
+++ b/spec/models/project_spec.rb
@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe Project, type: :model do
+
+ let(:tracker) { FactoryBot.create(:tracker) }
+ let(:project) { FactoryBot.create(:project, trackers: [tracker]) }
+ let(:issue) { FactoryBot.create(:issue, project: project, tracker: tracker) }
+ let(:custom_table) { FactoryBot.create(:custom_table, projects: [project], trackers: [tracker]) }
+
+
+ it '#all_issue_custom_tables' do
+ custom_table
+ expect(project.all_issue_custom_tables(issue)).
+ to include custom_table
+ end
+end
\ No newline at end of file
diff --git a/spec/views/custom_tables/new.html.erb_spec.rb b/spec/views/custom_tables/new.html.erb_spec.rb
new file mode 100644
index 0000000..ee3d34c
--- /dev/null
+++ b/spec/views/custom_tables/new.html.erb_spec.rb
@@ -0,0 +1,33 @@
+require "spec_helper"
+
+RSpec.describe "custom_tables/new" do
+ include_context 'logged as admin'
+
+ let(:tracker) { FactoryBot.create(:tracker) }
+ let(:role) { FactoryBot.create(:role) }
+ let(:custom_table) { FactoryBot.create(:custom_table, description: 'Table desc', trackers: [tracker], roles: [role]) }
+
+ before(:each) do
+ @custom_table = assign(:custom_table, custom_table)
+ end
+
+ it "It displays description" do
+ assign(:custom_table, custom_table)
+ render
+ expect(rendered).to match /Table desc/
+ end
+
+ it "It displays trackers" do
+ assign(:custom_table, custom_table)
+ render
+ expect(rendered).to match /#{custom_table.trackers.first.name}/
+ end
+
+ it "It displays roles" do
+ assign(:custom_table, custom_table)
+ render
+ expect(rendered).to match /#{custom_table.roles.first.name}/
+ end
+
+
+end
\ No newline at end of file
diff --git a/spec/views/issues/_custom_tables.html.erb_spec.rb b/spec/views/issues/_custom_tables.html.erb_spec.rb
index 9e10104..1d18455 100644
--- a/spec/views/issues/_custom_tables.html.erb_spec.rb
+++ b/spec/views/issues/_custom_tables.html.erb_spec.rb
@@ -3,7 +3,8 @@ require "spec_helper"
RSpec.describe "issues/_custom_tables" do
include_context 'logged as'
- let(:issue) { FactoryBot.create(:issue) }
+ let(:tracker) { FactoryBot.create(:tracker) }
+ let(:issue) { FactoryBot.create(:issue, tracker: tracker) }
let(:custom_table) { FactoryBot.create(:custom_table) }
before(:each) do
@@ -19,7 +20,6 @@ RSpec.describe "issues/_custom_tables" do
end
context 'with permission' do
- let(:issue) { FactoryBot.create(:issue) }
before(:each) do
allow_any_instance_of(User).
diff --git a/spec/views/issues/_query_custom_table.html.erb_spec.rb b/spec/views/issues/_query_custom_table.html.erb_spec.rb
deleted file mode 100644
index 79a3d5a..0000000
--- a/spec/views/issues/_query_custom_table.html.erb_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "spec_helper"
-
-RSpec.describe "issues/_query_custom_table" do
- include_context 'logged as admin'
- helper(QueriesHelper)
-
- let(:issue) { FactoryBot.create(:issue) }
- let(:custom_table) { FactoryBot.create(:custom_table) }
-
-
- it "Displays no data" do
- render partial: "issues/query_custom_table", locals: {
- query: custom_table.query,
- custom_table: custom_table,
- back_url: issue_path(issue),
- entities: custom_table.query.results_scope }
-
- expect(rendered).to match /No data to display/
- end
-
-end
\ No newline at end of file