Diff
Modified: trunk/app/controllers/networks_controller.rb (3187 => 3188)
--- trunk/app/controllers/networks_controller.rb 2012-11-12 23:00:28 UTC (rev 3187)
+++ trunk/app/controllers/networks_controller.rb 2012-11-13 01:19:31 UTC (rev 3188)
@@ -4,10 +4,13 @@
# See license.txt for details.
class NetworksController < ApplicationController
- before_filter :login_required, :except => [:index, :show, :search, :all]
+
+ include ApplicationHelper
+
+ before_filter :login_required, :except => [:index, :show, :content, :search, :all]
before_filter :find_networks, : [:all]
- before_filter :find_network, : [:membership_request, :show, :tag]
+ before_filter :find_network, : [:membership_request, :show, :tag, :content]
before_filter :find_network_auth_admin, : [:invite, :membership_invite, :membership_invite_external]
before_filter :find_network_auth_owner, : [:edit, :update, :destroy]
@@ -362,6 +365,31 @@
end
end
+ # GET /networks/1/content
+ def content
+ respond_to do |format|
+ format.html do
+
+ @pivot, problem = calculate_pivot(
+
+ :pivot_options => Conf.pivot_options,
+ :params => params,
+ :user => current_user,
+ :search_models => [Workflow, Blob, Pack, Service],
+ :search_limit => Conf.max_search_size,
+
+ :locked_filters => { 'GROUP_ID' => @network.id.to_s },
+
+ :active_filters => ["CATEGORY", "TYPE_ID", "TAG_ID", "USER_ID",
+ "LICENSE_ID", "GROUP_ID", "WSDL_ENDPOINT",
+ "CURATION_EVENT", "SERVICE_PROVIDER",
+ "SERVICE_COUNTRY", "SERVICE_STATUS"])
+
+ flash.now[:error] = problem if problem
+ end
+ end
+ end
+
# GET /networks/new
def new
@network = Network.new(:user_id => current_user.id)
Modified: trunk/app/helpers/application_helper.rb (3187 => 3188)
--- trunk/app/helpers/application_helper.rb 2012-11-12 23:00:28 UTC (rev 3187)
+++ trunk/app/helpers/application_helper.rb 2012-11-13 01:19:31 UTC (rev 3188)
@@ -779,6 +779,8 @@
return "famfamfam_silk/flag_red.png"
when "transfer_ownership"
return "famfamfam_silk/key_go.png"
+ when "content"
+ return "famfamfam_silk/application_side_list.png"
else
return Conf.label_icons[method.to_s] if Conf.label_icons[method.to_s]
end
Modified: trunk/app/views/networks/_breadcrumbs.rhtml (3187 => 3188)
--- trunk/app/views/networks/_breadcrumbs.rhtml 2012-11-12 23:00:28 UTC (rev 3187)
+++ trunk/app/views/networks/_breadcrumbs.rhtml 2012-11-13 01:19:31 UTC (rev 3188)
@@ -1,8 +1,11 @@
<li><%= link_to 'Groups', networks_path -%></li>
-<% if ["show", "new", "edit", "search", "all", "invite"].include? controller.action_name.to_s -%>
+<% if ["show", "content", "new", "edit", "search", "all", "invite"].include? controller.action_name.to_s -%>
<% case controller.action_name.to_s; when "show" %>
<li><%= h(@network.title) -%></li>
+ <% when "content" %>
+ <li><%= link_to "#{h(@network.title)}", network_path(@network) %></li>
+ <li>Content</li>
<% when "new" %>
<li>New Group</li>
<% when "edit" %>
Modified: trunk/app/views/networks/show.rhtml (3187 => 3188)
--- trunk/app/views/networks/show.rhtml 2012-11-12 23:00:28 UTC (rev 3187)
+++ trunk/app/views/networks/show.rhtml 2012-11-13 01:19:31 UTC (rev 3188)
@@ -1,6 +1,7 @@
<% t "#{h @network.title}" -%>
-<% if logged_in? %>
+<ul class="sectionIcons">
+ <% if logged_in? %>
<% if current_user.membership_request_pending?(@network.id) %>
<div class="box_standout">
<span style="text-align: left;"><b>You have already sent a membership request to join this group. Awaiting admin confirmation.</b></span>
@@ -11,7 +12,6 @@
</div>
<% end %>
- <ul class="sectionIcons">
<% unless mine? @network %>
<% if @network.member? current_user.id %>
<% cur_membership = Membership.find(:first, :conditions => ["network_id = ? AND user_id = ?", @network.id, current_user.id] ) %>
@@ -31,8 +31,9 @@
<li><%= icon('edit', edit_network_path(@network), 'Edit', nil, 'Edit Group') %></li>
<li><%= icon('destroy', network_path(@network), 'Delete Group', { :confirm => 'Are you sure?', :method => :delete }, 'Delete Group') %></li>
<% end %>
- </ul>
-<% end %>
+ <% end %>
+ <li><%= icon('content', content_network_path(@network), 'View Group Content', nil, 'View Group Content') %></li>
+</ul>
<h1>
Group: <%=h @network.title %>
@@ -44,7 +45,7 @@
|
<a href=""
|
- <a href="" Items (<%= @shared_items.length -%>)</a>
+ <%= link_to("Shared Items", content_network_path(@network)) -%>
|
<a href="" (<%= @network.creditations.length -%>)</a>
|
@@ -162,32 +163,6 @@
</div>
<div class="tabContainer">
- <div class="tabTitle">Shared Items (<%= @shared_items.length -%>)</div>
- <div class="tabContent" id="shared_items">
- <a name="shared_items"></a>
- <% unless @shared_items.empty? %>
- <%= view_privileges_notice %>
-
- <div style="float: right; margin: 0.5em;">
- Sort:
- <select = this.options[this.selectedIndex].value;">
- <% @item_sort_options.each do |option, label| %>
- <option value="?item_sort=<%= option -%>#shared_items" <% if params[:item_sort] == option -%> selected="selected"<% end -%>><%= label -%></option>
- <% end %>
- </select>
- </div>
-
- <%= render :partial => "contributions/table", :locals => { :collection => @shared_items } %>
-
- <div style="clear: both"></div>
-
- <% else %>
- <p class="none_text">No items have been shared with this Group yet.</p>
- <% end %>
- </div>
-</div>
-
-<div class="tabContainer">
<div class="tabTitle">Creditations (<%= @network.creditations.length -%>)</div>
<div class="tabContent">
Modified: trunk/config/routes.rb (3187 => 3188)
--- trunk/config/routes.rb 2012-11-12 23:00:28 UTC (rev 3187)
+++ trunk/config/routes.rb 2012-11-13 01:19:31 UTC (rev 3188)
@@ -250,7 +250,8 @@
map.resources :networks,
:as => :groups,
:collection => { :all => :get, :search => :get },
- :member => { :invite => :get,
+ :member => { :content => :get,
+ :invite => :get,
:membership_invite => :post,
:membership_invite_external => :post,
:membership_request => :get,