Business intelligence made simple
Added non-editable queries
Andrew Kane89c8ff79b1ae
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 6c2fcd91..1aee6a94 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -157,7 +157,10 @@ module Blazer@query = Blazer::Query.new@query.creator = blazer_user if @query.respond_to?(:creator)end- if @query.update(query_params)+ unless @query.editable?(blazer_user)+ @query.errors.add(:base, "Sorry, permission denied")+ end+ if @query.errors.empty? && @query.update(query_params)redirect_to query_path(@query, variable_params)elserender :edit@@ -165,7 +168,7 @@ module Blazerenddef destroy- @query.destroy+ @query.destroy if @query.editable?(blazer_user)redirect_to root_urlend@@ -180,13 +183,13 @@ module Blazer@my_queries =if blazer_userrecent_query_ids = Blazer::Audit.where(user_id: blazer_user.id).where("query_id IS NOT NULL").order("created_at desc").limit(100).pluck(:query_id).uniq.first(20)- queries = Blazer::Query.where(id: recent_query_ids).index_by(&:id)+ queries = Blazer::Query.where("name <> ''").where(id: recent_query_ids).index_by(&:id)recent_query_ids.map { |query_id| queries[query_id] }.compactelse[]end- @queries = Blazer::Query.order(:name)+ @queries = Blazer::Query.where("name <> ''").order(:name)@queries = @queries.where("id NOT IN (?)", @my_queries.map(&:id)) if @my_queries.any?@queries = @queries.includes(:creator) if Blazer.user_class@queries = @queries.limit(limit) if limitdiff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rbindex 96dd5a86..a81b12ba 100644--- a/app/models/blazer/query.rb+++ b/app/models/blazer/query.rb@@ -6,15 +6,18 @@ module Blazerhas_many :dashboards, through: :dashboard_querieshas_many :audits- validates :name, presence: truevalidates :statement, presence: truedef to_param- [id, name.gsub("'", "").parameterize].join("-")+ [id, name].compact.join("-").gsub("'", "").parameterizeenddef friendly_name- name.gsub(/\[.+\]/, "").strip+ name.to_s.gsub(/\[.+\]/, "").strip+ end++ def editable?(user)+ (name.present? && name.first != "*") || user == creatorendendenddiff --git a/app/views/blazer/queries/show.html.erb b/app/views/blazer/queries/show.html.erbindex 1538f323..dff696dc 100644--- a/app/views/blazer/queries/show.html.erb+++ b/app/views/blazer/queries/show.html.erb@@ -24,7 +24,7 @@</h3></div><div class="col-sm-3 text-right">- <%= link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default" %>+ <%= link_to "Edit", edit_query_path(@query, variable_params), class: "btn btn-default", disabled: [email protected]?(blazer_user) %><%= link_to "Fork", new_query_path(variable_params.merge(fork_query_id: @query.id, data_source: @query.data_source, name: @query.name)), class: "btn btn-info" %><% if !@error && @success %>