From 0e409445ccc7e539f5a5c4d094f568c2cd90c7ae Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 20 Nov 2014 10:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=88=91=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb             |  4 +++-
 app/views/my/blocks/_assiagn_issue.html.erb      | 12 +++++++-----
 app/views/my/blocks/_issuesreportedbyme.html.erb |  2 +-
 app/views/my/blocks/_issueswatched.html.erb      |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 97c0ce4f6..d83942605 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -60,7 +60,9 @@ class IssuesController < ApplicationController
     sort_update(@query.sortable_columns)
     @query.sort_criteria = sort_criteria.to_a
     
-    @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
+    if @issue
+      @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'
+    end
 
     if @query.valid?
       case params[:format]
diff --git a/app/views/my/blocks/_assiagn_issue.html.erb b/app/views/my/blocks/_assiagn_issue.html.erb
index 6e7df84fd..1cd940eb9 100644
--- a/app/views/my/blocks/_assiagn_issue.html.erb
+++ b/app/views/my/blocks/_assiagn_issue.html.erb
@@ -11,11 +11,13 @@
       </ul>
     </div>
      -->
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
-                                                       :action => 'index',
-                                                       :set_filter => 1,
-                                                       :assigned_to_id => 'me',
-                                                       :sort => 'priority:desc,updated_on:desc' %></p>
+    <p class="small">
+      <%#= link_to l(:label_issue_view_all), :controller => 'issues',
+               :action => 'index',
+               :set_filter => 1,
+               :assigned_to_id => 'me',
+               :sort => 'priority:desc,updated_on:desc' %>
+    </p>
 <% end %>
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom,
diff --git a/app/views/my/blocks/_issuesreportedbyme.html.erb b/app/views/my/blocks/_issuesreportedbyme.html.erb
index 06bbda7f8..de5e20229 100644
--- a/app/views/my/blocks/_issuesreportedbyme.html.erb
+++ b/app/views/my/blocks/_issuesreportedbyme.html.erb
@@ -3,7 +3,7 @@
 <% reported_issues = issuesreportedbyme_items %>
 <%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
 <% if reported_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+<p class="small"><%#= link_to l(:label_issue_view_all), :controller => 'issues',
                                                        :action => 'index',
                                                        :set_filter => 1,
                                                        :status_id => '*',
diff --git a/app/views/my/blocks/_issueswatched.html.erb b/app/views/my/blocks/_issueswatched.html.erb
index 510920a08..906a47b12 100644
--- a/app/views/my/blocks/_issueswatched.html.erb
+++ b/app/views/my/blocks/_issueswatched.html.erb
@@ -3,7 +3,7 @@
 
 <%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
 <% if watched_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+<p class="small"><%#= link_to l(:label_issue_view_all), :controller => 'issues',
                                                        :action => 'index',
                                                        :set_filter => 1,
                                                        :watcher_id => 'me',