This commit is contained in:
parent
f73ea104bb
commit
cefddb635a
|
@ -83,7 +83,7 @@ class MemosController < ApplicationController
|
|||
end
|
||||
|
||||
def edit
|
||||
@replying = true
|
||||
@replying = false
|
||||
end
|
||||
|
||||
def update
|
||||
|
|
|
@ -1332,7 +1332,6 @@ module ApplicationHelper
|
|||
# Add by Tao
|
||||
def url_to_avatar(source)
|
||||
source = nil if source.kind_of?(String)
|
||||
logger.error "======================================#{source.class}"
|
||||
get_avatar(source)
|
||||
end
|
||||
# Endof Tao's code
|
||||
|
|
|
@ -1,6 +1,11 @@
|
|||
<div class="content-title-top">
|
||||
<div style="text-align:right;">
|
||||
<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
|
||||
:html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
|
||||
|
||||
<%= link_to l(:label_query), '#', :class => 'icon icon-help',
|
||||
:onclick => '$("#custom_query").toggle(); ' if User.current.logged? %>
|
||||
</div>
|
||||
</div>
|
||||
</h3>
|
||||
<div class="contextual">
|
||||
|
@ -14,6 +19,7 @@
|
|||
|
||||
<%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
|
||||
<%= hidden_field_tag 'set_filter', '1' %>
|
||||
<div id="custom_query", style='display: none;'>
|
||||
<div id="query_form_content" class="hide-when-print">
|
||||
<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
|
||||
<legend onclick="toggleFieldset(this);">
|
||||
|
@ -49,10 +55,10 @@
|
|||
<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
|
||||
<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= error_messages_for 'query' %>
|
||||
|
||||
<% if @query.valid? %>
|
||||
<% if @issues.empty? %>
|
||||
<p class="nodata">
|
||||
|
@ -60,7 +66,7 @@
|
|||
</p>
|
||||
<% else %>
|
||||
<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
|
||||
<div class="pagination"><%= pagination_links_full @issue_pages, @issue_count %> </div>
|
||||
<div class="pagination"><ul><%= pagination_links_full @issue_pages, @issue_count %></ul></div>
|
||||
<% end %>
|
||||
<div style="float: right; padding-top: 30px">
|
||||
<% other_formats_links do |f| %>
|
||||
|
|
Loading…
Reference in New Issue