Fixed #3 error occurs when delete a default query for all projects

hidakatsuya · Jul 31, 2014 · 42ba90e · 42ba90e
1 parent 6a9d33a
commit 42ba90e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/patches/controllers/issues_controller_patch.rb b/app/patches/controllers/issues_controller_patch.rb
@@ -66,7 +66,7 @@ def show_all?
     end
 
     def default_query_module_enabled?
-      @project.module_enabled?(:default_custom_query)
+      @project && @project.module_enabled?(:default_custom_query)
     end
   end
 end

diff --git a/app/views/issues/_sidebar_issues_bottom.html.erb b/app/views/issues/_sidebar_issues_bottom.html.erb
@@ -1,4 +1,4 @@
-<% if @project.module_enabled?(:default_custom_query) && @project.default_query.present? %>
+<% if @project && @project.module_enabled?(:default_custom_query) && @project.default_query.present? %>
 <script>
   (function() {
     var allIssuesPath = '<%=j project_issues_path(@project, set_filter: 1) %>';
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ def show_all? @@
         end
         def default_query_module_enabled?
-          @project.module_enabled?(:default_custom_query)
+          @project && @project.module_enabled?(:default_custom_query)
         end
       end
     end
@@ Expand Down @@