Diff
Modified: branches/packs/app/controllers/items_controller.rb (3689 => 3690)
--- branches/packs/app/controllers/items_controller.rb 2013-09-06 21:03:08 UTC (rev 3689)
+++ branches/packs/app/controllers/items_controller.rb 2013-09-06 21:22:26 UTC (rev 3690)
@@ -11,7 +11,21 @@
before_filter :find_item
def index
- show
+ respond_to do |format|
+
+ format.html {
+ show
+ }
+
+ format.rss {
+ if params[:pack_id]
+ @pack = Pack.find(params[:pack_id])
+ if Authorization.check('view', @pack, current_user)
+ render :action ="" 'items.rxml', :layout => false
+ end
+ end
+ }
+ end
end
def show
Modified: branches/packs/app/controllers/packs_controller.rb (3689 => 3690)
--- branches/packs/app/controllers/packs_controller.rb 2013-09-06 21:03:08 UTC (rev 3689)
+++ branches/packs/app/controllers/packs_controller.rb 2013-09-06 21:22:26 UTC (rev 3690)
@@ -454,13 +454,6 @@
end
end
- def items
- respond_to do |format|
- format.html { item_show }
- format.rss { render :action ="" 'items.rxml', :layout => false }
- end
- end
-
def snapshot
success = @pack.snapshot!
Deleted: branches/packs/app/views/packs/items.rxml (3689 => 3690)
--- branches/packs/app/views/packs/items.rxml 2013-09-06 21:03:08 UTC (rev 3689)
+++ branches/packs/app/views/packs/items.rxml 2013-09-06 21:22:26 UTC (rev 3690)
@@ -1,12 +0,0 @@
-xml.instruct!
-
-xml.rss "version" => "2.0", 'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/", 'xmlns:atom' => "http://www.w3.org/2005/Atom" do
- xml.channel do
- xml.title "#{Conf.sitename} - Pack: #{h @pack.title} - Items"
- xml.link pack_url(@pack)
- xml.language "en-us"
- xml.ttl "60"
- xml.description "RSS feed listing all the items in the pack: #{h @pack.title}."
- render(:partial => "layouts/pack_items", :locals => { :pack => @pack, :xm => xml })
- end
-end