MS switched request new links to just the request link
This commit is contained in:
parent
d73d36f162
commit
bda87bbeab
6 changed files with 5 additions and 4 deletions
|
|
@ -2,7 +2,7 @@
|
||||||
= link_to 'albums', albums_path
|
= link_to 'albums', albums_path
|
||||||
>>
|
>>
|
||||||
= @album.name
|
= @album.name
|
||||||
%h5= "last updated: #{how_long_ago(@album)}"
|
%h4= "last updated: #{how_long_ago(@album)}"
|
||||||
-unless mine? @album
|
-unless mine? @album
|
||||||
%h4= 'by ' + @album.person.real_name
|
%h4= 'by ' + @album.person.real_name
|
||||||
-if mine? @album
|
-if mine? @album
|
||||||
|
|
|
||||||
|
|
@ -12,5 +12,5 @@
|
||||||
- for author in @subscribed_persons
|
- for author in @subscribed_persons
|
||||||
%li= link_to author.username, author_path(author)
|
%li= link_to author.username, author_path(author)
|
||||||
|
|
||||||
= link_to "add a new person", new_request_path
|
= link_to "add a new person", requests_path
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
%td= link_to 'Show', person
|
%td= link_to 'Show', person
|
||||||
%td= link_to 'Destroy', person, :confirm => 'Are you sure?', :method => :delete
|
%td= link_to 'Destroy', person, :confirm => 'Are you sure?', :method => :delete
|
||||||
|
|
||||||
%p= link_to "Add a friend", new_request_path
|
%p= link_to "Add a friend", requests_path
|
||||||
|
|
||||||
#pagination
|
#pagination
|
||||||
= will_paginate @people
|
= will_paginate @people
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -14,7 +14,7 @@ Factory.define :person do |p|
|
||||||
p.email "bob-person@aol.com"
|
p.email "bob-person@aol.com"
|
||||||
p.active true
|
p.active true
|
||||||
p.sequence(:url) {|n|"http://google-#{n}.com/"}
|
p.sequence(:url) {|n|"http://google-#{n}.com/"}
|
||||||
p.key_fingerprint GPGME::list_keys("Aditi").first.subkeys.first.fingerprint
|
p.key_fingerprint "fffffffffffffffffooooooooooooooo"
|
||||||
p.profile Profile.new( :first_name => "Robert", :last_name => "Grimm" )
|
p.profile Profile.new( :first_name => "Robert", :last_name => "Grimm" )
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
require File.dirname(__FILE__) + '/../spec_helper'
|
require File.dirname(__FILE__) + '/../spec_helper'
|
||||||
|
|
||||||
include ApplicationHelper
|
include ApplicationHelper
|
||||||
|
include Diaspora::DiasporaParser
|
||||||
|
|
||||||
describe Diaspora::DiasporaParser do
|
describe Diaspora::DiasporaParser do
|
||||||
before do
|
before do
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue