Skip to content

Business intelligence made simple

Improved fix for some forked queries not appearing on home page

Andrew Kane3aa9cbfd0941
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bef05f0e..5bc48986 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
+## 2.4.5 (unreleased)
+
+- Improved fix for some forked queries not appearing on home page
+
## 2.4.4 (2021-09-15)
-- Fixed issue with forked queries not appearing on home page
+- Fixed issue with some forked queries not appearing on home page
## 2.4.3 (2021-07-27)
diff --git a/README.md b/README.md
index 934584ce..9cc9561f 100644
--- a/README.md
+++ b/README.md
@@ -975,14 +975,6 @@ override_csp: true
## Upgrading
-### 2.4.4
-
-Due to a bug, some newly forked queries stopped appearing on the home page when archiving was enabled. To restore them, run:
-
-```ruby
-Blazer::Query.where(status: nil).update_all(status: "active")
-```
-
### 2.3
To archive queries, create a migration
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index bc464cd7..5f2eb9c2 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -179,8 +179,8 @@ module Blazer
if params[:commit] == "Fork"
@query = Blazer::Query.new
@query.creator = blazer_user if @query.respond_to?(:creator)
- @query.status = "active" if @query.respond_to?(:status)
end
+ @query.status = "active" if @query.respond_to?(:status)
unless @query.editable?(blazer_user)
@query.errors.add(:base, "Sorry, permission denied")
end
diff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rb
index 30d1c6fb..0605f3e5 100644
--- a/app/models/blazer/query.rb
+++ b/app/models/blazer/query.rb
@@ -8,7 +8,7 @@ module Blazer
validates :statement, presence: true
- scope :active, -> { column_names.include?("status") ? where(status: "active") : all }
+ scope :active, -> { column_names.include?("status") ? where(status: ["active", nil]) : all }
scope :named, -> { where.not(name: "") }
def to_param