MS i had broke atom generation in my refactor. now it is fixed

This commit is contained in:
maxwell 2010-07-26 17:39:48 -07:00
parent 9afb8beb25
commit d73d36f162
5 changed files with 7 additions and 3 deletions

View file

@ -1,4 +1,6 @@
class ApplicationController < ActionController::Base
require 'lib/diaspora/ostatus_generator'
protect_from_forgery :except => :receive
layout 'application'

View file

@ -11,5 +11,5 @@
%div.image_cycle
- for photo in post.photos[0..3]
= image_tag photo.image.url(:thumb_large)
= link_to (image_tag photo.image.url(:thumb_large)), album_path(post)

View file

@ -2,6 +2,7 @@
= link_to 'albums', albums_path
>>
= @album.name
%h5= "last updated: #{how_long_ago(@album)}"
-unless mine? @album
%h4= 'by ' + @album.person.real_name
-if mine? @album
@ -11,4 +12,4 @@
-if mine? @album
%p
= link_to "Destroy", @album, :confirm => 'Are you sure?', :method => :delete
= link_to "Delete Album", @album, :confirm => 'Are you sure?', :method => :delete

View file

@ -53,7 +53,7 @@ module Diaspora
def self.entries(objects)
xml = ""
if objects.respond_to? :each
objects.each {|x| xml << x.to_ostatus}
objects.each {|x| xml << x.to_activity}
else
xml << objects.to_activity
end

View file

@ -6,6 +6,7 @@
$("#publisher_content_pickers .photo").click(selectPublisherTab);
$("#new_status_message").submit(function() {
var new_status = $('#status_message_message').val() + " - just now";
$('#latest_message').text( new_status );
});