Merge pull request #7855 from opf/fix/default_order_regex

increase strictness on regexp for default orders

[ci skip]
pull/7858/head
Oliver Günther 5 years ago committed by GitHub
commit 33454926e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/models/queries/members/orders/default_order.rb
  2. 2
      app/models/queries/news/orders/default_order.rb
  3. 2
      app/models/queries/projects/orders/default_order.rb
  4. 2
      app/models/queries/relations/orders/default_order.rb
  5. 2
      app/models/queries/time_entries/orders/default_order.rb
  6. 2
      app/models/queries/users/orders/default_order.rb
  7. 2
      modules/documents/app/models/queries/documents/orders/default_order.rb

@ -32,6 +32,6 @@ class Queries::Members::Orders::DefaultOrder < Queries::BaseOrder
self.model = Member
def self.key
/id|created_on/
/\A(id|created_on)\z/
end
end

@ -32,6 +32,6 @@ class Queries::News::Orders::DefaultOrder < Queries::BaseOrder
self.model = News
def self.key
/id|created_on/
/\A(id|created_on)\z/
end
end

@ -32,6 +32,6 @@ class Queries::Projects::Orders::DefaultOrder < Queries::BaseOrder
self.model = Project
def self.key
/id|name|created_at|public|lft/
/\A(id|name|created_at|public|lft)\z/
end
end

@ -34,7 +34,7 @@ module Queries
self.model = Relation
def self.key
/id|from|to|involved|type/
/\A(id|from|to|involved|type)\z/
end
end
end

@ -32,6 +32,6 @@ class Queries::TimeEntries::Orders::DefaultOrder < Queries::BaseOrder
self.model = TimeEntry
def self.key
/id|hours|spent_on|created_on/
/\A(id|hours|spent_on|created_on)\z/
end
end

@ -31,6 +31,6 @@ class Queries::Users::Orders::DefaultOrder < Queries::BaseOrder
self.model = User
def self.key
/id|lastname|firstname|mail|login/
/\A(id|lastname|firstname|mail|login)\z/
end
end

@ -32,6 +32,6 @@ class Queries::Documents::Orders::DefaultOrder < Queries::BaseOrder
self.model = Document
def self.key
/id|created_on/
/\A(id|created_on)\z/
end
end

Loading…
Cancel
Save