nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber

Browse source
This commit is contained in:
MrZYX 2011-04-17 21:28:09 +02:00
parent 981d39d220
commit 9df8f83276
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/diaspora/user/querying.rb
View file

@ -20,7 +20,7 @@ module Diaspora
order_field = opts[:order].split.first.to_sym order_field = opts[:order].split.first.to_sym
opts[:hidden] ||= false opts[:hidden] ||= false
order_with_table = 'posts.' + opts[:order] order_with_table = 'posts.' + opts[:order]
opts[:max_time] = Time.at(opts[:max_time]) if opts[:max_time].instance_of?(Fixnum) opts[:max_time] = Time.at(opts[:max_time]) if opts[:max_time].is_a?(Integer)
opts[:max_time] ||= Time.now + 1 opts[:max_time] ||= Time.now + 1
select_clause ='DISTINCT posts.id, posts.updated_at AS updated_at, posts.created_at AS created_at' select_clause ='DISTINCT posts.id, posts.updated_at AS updated_at, posts.created_at AS created_at'

6
public/javascripts/publisher.js
View file

@ -346,8 +346,9 @@ var Publisher = {
}); });
}, },
initialize: function() { initialize: function() {
Diaspora.widgets.subscribe("stream/reloaded", Publisher.initialize); Publisher.cachedForm = Publisher.cachedSubmit =
Publisher.cachedInput = Publisher.cachedHiddenInput = false;
Publisher.bindServiceIcons(); Publisher.bindServiceIcons();
Publisher.bindPublicIcon(); Publisher.bindPublicIcon();
Publisher.bindAspectToggles(); Publisher.bindAspectToggles();
@ -368,4 +369,5 @@ var Publisher = {
$(document).ready(function() { $(document).ready(function() {
Publisher.initialize(); Publisher.initialize();
Diaspora.widgets.subscribe("stream/reloaded", Publisher.initialize);
}); });