config/initializers/dummy_models.rb @@ -502,6 +502,9 @@ class ApplicationController < ActionController::Base end end related << 'public_query' + related << 'related-tools-create-or-link-or-remove' + related << 'related-tools-restore' + related << 'related-tools-import' related.each do |related_controller| expire_fragment_for_all_versions(item, { :urlified_name => item.basket.urlified_name, app/controllers/application.rb @@ -12,6 +12,9 @@ class TopicsController < ApplicationController def show prepare_item_variables_for('Topic') @topic = @item + # If we are serving a cached page, we still need + # some details in @topic, so lets make a dummy one + @topic = DummyModel.new({ :id => @cache_id, :basket => @current_basket }) if @topic.nil? respond_to do |format| format.html app/controllers/topics_controller.rb @@ -577,8 +577,15 @@ module ApplicationHelper def link_to_related_item_function(options={}) options = { :link_text => "#{options[:function].capitalize} an Existing Related Item" }.merge(options) link_text = options.delete(:link_text) - link = link_to(link_text, { :controller => 'search', :action => 'find_related' }.merge(options), - { :popup => ['links', 'height=500,width=500,scrollbars=yes,top=100,left=100,resizable=yes'] }) + disabled = false + disabled = true if options[:function] == 'remove' && @total_item_counts < 1 + if options[:function] == 'restore' + restore_count = ContentItemRelation::Deleted.count(:conditions => { :topic_id => options[:relate_to_topic] }) + disabled = true if restore_count < 1 + link_text += " (#{restore_count})" + end + link = disabled ? link_text : link_to(link_text, { :controller => 'search', :action => 'find_related' }.merge(options), + { :popup => ['links', 'height=500,width=500,scrollbars=yes,top=100,left=100,resizable=yes'] }) content_tag('li', link) end app/helpers/application_helper.rb @@ -1,18 +1,23 @@ <% topics_only = defined?(topics_only) ? topics_only : false -# These queries uses zoom and aren't caches -@public_item_counts = public_related_items_for(item, { :topics_only => topics_only, :count_only => true }) -@private_item_counts = private_related_items_for(item, { :topics_only => topics_only, :count_only => true }) - -# The public query uses mysql and is cached -cache({ :related => 'public_query', :id => @cache_id }) do - @public_items = public_related_items_for(item, { :topics_only => topics_only }) - "(this just ensures queries don't run when unless needed - ignore this file)" +# These queries uses zoom and aren't cached +@total_item_counts = 0 +@content_relations_count = ContentItemRelation.count(:conditions => { :topic_id => @cache_id }) +if @content_relations_count > 0 + @public_item_counts = public_related_items_for(item, { :topics_only => topics_only, :count_only => true }) + @private_item_counts = private_related_items_for(item, { :topics_only => topics_only, :count_only => true }) + @public_item_counts.each { |v| @total_item_counts += v.last } + @private_item_counts.each { |v| @total_item_counts += v.last } + + # The public query uses mysql and is cached + cache({ :related => 'public_query', :id => @cache_id }) do + @public_items = public_related_items_for(item, { :topics_only => topics_only }) + "(this just ensures queries don't run when unless needed - ignore this file)" + end + # The private query uses zoom and isn't cached + @private_items = private_related_items_for(item, { :topics_only => topics_only }) end -# The private query uses zoom and isn't cached -@private_items = private_related_items_for(item, { :topics_only => topics_only }) - -%> <% if topics_only -%> @@ -32,21 +37,29 @@ end <%= render(:partial => "topics/secondary_wrapper_start", :locals => { :div_id => "related", :class_suffix => "-blue" }) -%> - <h2 class="related-link">Related Items</h2> + <h2 class="related-link">Related Items (<%= @total_item_counts %>)</h2> <% if current_user_can_see_add_links? -%> - <% cache({ :part => 'related-tools' }) do -%> - <div id="related-items-tools"> - <ul> + <div id="related-items-tools"> + <ul> + <% cache({ :part => 'related-tools-create-or-link-or-remove', :id => @cache_id }) do -%> <%= header_add_links(:relate_to_topic => item, :link_text => 'Create', :class => 'first') -%> <%= link_to_related_item_function(:link_text => 'Link Existing', :function => 'add', :relate_to_topic => item) -%> <%= link_to_related_item_function(:link_text => 'Remove', :function => 'remove', :relate_to_topic => item) -%> - <%= link_to_related_item_function(:link_text => 'Restore', :function => 'restore', :relate_to_topic => item) -%> - <%= link_to_add_set_of_related_items(:link_text => 'Import Set', :relate_to_topic => item) -%> - </ul> - </div> - <div style="clear:both;"></div> - <% end -%> + <% end -%> + <% if @basket_moderator -%> + <% cache({ :part => 'related-tools-restore', :id => @cache_id }) do -%> + <%= link_to_related_item_function(:link_text => 'Restore', :function => 'restore', :relate_to_topic => item) -%> + <% end -%> + <% end -%> + <% if @site_admin -%> + <% cache({ :part => 'related-tools-import', :id => @cache_id }) do -%> + <%= link_to_add_set_of_related_items(:link_text => 'Import Set', :relate_to_topic => item) -%> + <% end -%> + <% end -%> + </ul> + </div> + <div style="clear:both;"></div> <% end -%> <div id="detail-linked-toprow"> @@ -71,8 +84,6 @@ end :locals => { :item => item, :zoom_class => 'WebLink' }) -%> </div> - <div style="clear:both;"></div> - <%= render(:partial => "topics/secondary_wrapper_end") -%> <% end -%> app/views/topics/_related_items.html.erb @@ -1,7 +1,12 @@ <% pretty_class_plural = zoom_class_plural_humanize(zoom_class) controller = zoom_class_controller(zoom_class) -total_items = (@public_item_counts[zoom_class] + @private_item_counts[zoom_class]) +if @total_item_counts > 0 + total_items = (@public_item_counts[zoom_class] + @private_item_counts[zoom_class]) + only_public_items = (@public_item_counts[zoom_class] > 0 && @private_item_counts[zoom_class] < 1) +else + total_items = 0 +end are_still_images = (zoom_class == 'StillImage') display_num = are_still_images ? NUMBER_OF_RELATED_IMAGES_TO_DISPLAY : NUMBER_OF_RELATED_THINGS_TO_DISPLAY_PER_TYPE display_heading = defined?(display_heading) && display_heading != false ? display_heading : nil @@ -15,33 +20,34 @@ display_no_item_text = defined?(display_no_item_text) ? display_no_item_text : f <h4><%= "#{pretty_class_plural} (#{total_items})" -%></h4> <% end -%> <% if total_items > 0 -%> - <ul> + <%= '<ul>' unless only_public_items -%> <% if @public_item_counts[zoom_class] > 0 -%> - <li> - <strong>Public</strong> - <% cache ({ :related => controller, :id => @cache_id }) do -%> - <%= related_items_display_of @public_items[zoom_class], - { :are_still_images => are_still_images, - :item => item, - :zoom_class => zoom_class, - :display_num => display_num, - :total_num => @public_item_counts[zoom_class] } -%> - <% end -%> - </li> - <% end -%> - <% if @private_item_counts[zoom_class] > 0 -%> - <li> - <strong>Private</strong> - <%= related_items_display_of @private_items[zoom_class], + <% unless only_public_items -%> + <li><strong>Public</strong> + <% end -%> + <% cache ({ :related => controller, :id => @cache_id }) do -%> + <%= related_items_display_of @public_items[zoom_class], { :are_still_images => are_still_images, :item => item, :zoom_class => zoom_class, :display_num => display_num, - :total_num => @private_item_counts[zoom_class], - :privacy_type => 'private' } -%> - </li> + :total_num => @public_item_counts[zoom_class] } -%> + <% end -%> + <%= '</li>' unless only_public_items -%> + <% end -%> + <% if @private_item_counts[zoom_class] > 0 -%> + <%= '<li>' unless only_public_items -%> + <strong>Private</strong> + <%= related_items_display_of @private_items[zoom_class], + { :are_still_images => are_still_images, + :item => item, + :zoom_class => zoom_class, + :display_num => display_num, + :total_num => @private_item_counts[zoom_class], + :privacy_type => 'private' } -%> + <%= '</li>' unless only_public_items -%> <% end -%> - </ul> + <%= '</ul>' unless only_public_items -%> <% elsif display_no_item_text -%> <h4>This <%= pretty_class_plural.singularize -%> is not related to any topics at this time.</h4> <% end -%> app/views/topics/_related_items_section.html.erb 60e78b84c4bf4dfa3d0a3b87e4a6257f575c31ba Kieran Pilkington kieran@katipo.co.nz http://github.com/kete/kete/commit/06d043040a98f957e8ae1b0d1bdd50e44ef76d9f 06d043040a98f957e8ae1b0d1bdd50e44ef76d9f 2009-01-27T21:16:06-08:00 2009-01-27T21:16:06-08:00 refinement: adding permissions to the related item links, separating into three caches, disabling restore and remove links when appropriate, making a quick mysql query to see if zoom ones are necessary, when only public related items are being displayed, hide the public label. df139580939dfae125cb96ea7706e190d45d942c Kieran Pilkington kieran@katipo.co.nz