jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
sw 2014-08-18 11:09:40 +08:00
parent 5a7aabd7cf 13becbefb2
commit 012791e44d
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/issue.rb
View File

@ -138,10 +138,10 @@ class Issue < ActiveRecord::Base
nil nil
when 'default' when 'default'
user_ids = [user.id] + user.groups.map(&:id) user_ids = [user.id] + user.groups.map(&:id)
"(#{table_name}.is_private = #{connection.quoted_false}) OR (#{table_name}.author_id = #{user.id} OR #{table_name}.tracker_id IN (#{user_ids.join(',')}) OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" "(#{table_name}.is_private = #{connection.quoted_false}) OR (#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
when 'own' when 'own'
user_ids = [user.id] + user.groups.map(&:id) user_ids = [user.id] + user.groups.map(&:id)
"(#{table_name}.author_id = #{user.id} OR #{table_name}.tracker_id IN (#{user_ids.join(',')}) OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
else else
'1=0' '1=0'
end end
@ -159,9 +159,9 @@ class Issue < ActiveRecord::Base
when 'all' when 'all'
true true
when 'default' when 'default'
(!self.is_private? ||self.tracker == user) || (self.author == user || user.is_or_belongs_to?(assigned_to)) !self.is_private? || (self.author == user || user.is_or_belongs_to?(assigned_to))
when 'own' when 'own'
self.tracker == user || self.author == user || user.is_or_belongs_to?(assigned_to) self.author == user || user.is_or_belongs_to?(assigned_to)
else else
false false
end end

14
app/views/issues/index.html.erb
View File

@ -37,21 +37,21 @@
<!-- <!--
<fieldset class="collapsible collapsed"> <fieldset class="collapsible collapsed">
<legend onclick="toggleFieldset(this);"> <legend onclick="toggleFieldset(this);">
<%#= l(:label_options) %> <%= l(:label_options) %>
</legend> </legend>
<div style="display: none;"> <div style="display: none;">
<table> <table>
<tr> <tr>
<td><%#= l(:field_column_names) %></td> <td><%= l(:field_column_names) %></td>
<td><%#= render_query_columns_selection(@query) %></td> <td><%= render_query_columns_selection(@query) %></td>
</tr> </tr>
<tr> <tr>
<td><label for='group_by'><%#= l(:field_group_by) %></label></td> <td><label for='group_by'><%= l(:field_group_by) %></label></td>
<td><%#= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td> <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
</tr> </tr>
<tr> <tr>
<td><%#= l(:button_show) %></td> <td><%= l(:button_show) %></td>
<td><%#= available_block_columns_tags(@query) %></td> <td><%= available_block_columns_tags(@query) %></td>
</tr> </tr>
</table> </table>
</div> </div>

1
app/views/projects/show.html.erb
View File

@ -20,7 +20,6 @@
<% else %> <% else %>
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
<% end %> <% end %>
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %> <%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>