mirror of
https://github.com/TracksApp/tracks.git
synced 2026-04-18 01:59:02 +02:00
#1955: Migrate tags to belong to named users for enhanced privacy.
This commit is contained in:
parent
5ec2c77f78
commit
5394973346
9 changed files with 97 additions and 24 deletions
|
|
@ -129,7 +129,7 @@ module RecurringTodos
|
|||
end
|
||||
|
||||
def save_tags
|
||||
@recurring_todo.tag_with(@filterred_attributes[:tag_list]) if @filterred_attributes[:tag_list].present?
|
||||
@recurring_todo.tag_with(@filterred_attributes[:tag_list], @user) if @filterred_attributes[:tag_list].present?
|
||||
@recurring_todo.reload
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,15 @@ class Tag < ApplicationRecord
|
|||
has_many :taggings
|
||||
has_many :taggable, :through => :taggings
|
||||
|
||||
belongs_to :user
|
||||
|
||||
DELIMITER = ",".freeze # Controls how to split and join tagnames from strings. You may need to change the <tt>validates_format_of parameters</tt> if you change this.
|
||||
JOIN_DELIMITER = ", ".freeze
|
||||
|
||||
# If database speed becomes an issue, you could remove these validations and
|
||||
# rescue the ActiveRecord database constraint errors instead.
|
||||
validates_presence_of :name
|
||||
validates_uniqueness_of :name, :case_sensitive => false
|
||||
validates_uniqueness_of :name, :scope => "user_id", :case_sensitive => false
|
||||
|
||||
before_create :before_create
|
||||
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ class Todo < ApplicationRecord
|
|||
def add_tags=(params)
|
||||
unless params[:tag].nil?
|
||||
tag_list = params[:tag].inject([]) { |list, value| list << value[:name] }
|
||||
tag_with tag_list.join(", ")
|
||||
tag_with tag_list.join(", "), user
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ class User < ApplicationRecord
|
|||
end
|
||||
end
|
||||
|
||||
has_many :tags, dependent: :delete_all
|
||||
has_many :notes, -> { order "created_at DESC" }, dependent: :delete_all
|
||||
has_one :preference, dependent: :destroy
|
||||
has_many :attachments, through: :todos
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue