From 1ba81a33a24e25816618e169bb184acee4b99d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 3 Apr 2019 13:33:27 +0200 Subject: [PATCH] NameError: uninitialized constant #122 --- app/controllers/custom_workflows_controller.rb | 2 +- app/models/custom_workflow.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/custom_workflows_controller.rb b/app/controllers/custom_workflows_controller.rb index 6e571c3..c9f7c97 100644 --- a/app/controllers/custom_workflows_controller.rb +++ b/app/controllers/custom_workflows_controller.rb @@ -50,7 +50,7 @@ class CustomWorkflowsController < ApplicationController end def index - @workflows = CustomWorkflow.includes(:projects).all + @workflows = CustomWorkflow.includes(:projects).order(:position => :asc) respond_to do |format| format.html end diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb index d7b7ad7..089e6cf 100644 --- a/app/models/custom_workflow.rb +++ b/app/models/custom_workflow.rb @@ -33,8 +33,7 @@ class CustomWorkflow < ActiveRecord::Base validates_uniqueness_of :name, :case_sensitive => false validates_format_of :author, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true validate :validate_syntax, :validate_scripts_presence, :if => Proc.new {|workflow| workflow.respond_to?(:observable) and workflow.active?} - - default_scope { order(:position => :asc) } + scope :active, lambda { where(:active => true) } scope :for_project, (lambda do |project| where("is_for_all=? OR EXISTS (SELECT * FROM #{reflect_on_association(:projects).join_table} WHERE project_id=? AND custom_workflow_id=id)",