social_stream-base 0.9.18 → 0.9.19
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/stylesheets/contacts.css.scss +8 -3
- data/app/assets/stylesheets/frontpage.css.scss +1 -1
- data/app/assets/stylesheets/search.css.scss +17 -1
- data/app/controllers/contacts_controller.rb +2 -5
- data/app/models/contact.rb +3 -2
- data/app/views/activities/_options.html.erb +1 -1
- data/app/views/contacts/_form.html.erb +14 -7
- data/app/views/frontpage/_social_networks.html.erb +3 -0
- data/app/views/groups/_new.html.erb +2 -2
- data/app/views/groups/_show.html.erb +1 -2
- data/app/views/groups/index.html.erb +1 -1
- data/app/views/layouts/_header_signed_out.erb +1 -3
- data/app/views/notifications/activities/_follow_subject.html.erb +5 -2
- data/app/views/notifications/activities/_like_subject.html.erb +6 -2
- data/app/views/notifications/activities/_make-friend_subject.html.erb +5 -2
- data/app/views/notifications/activities/_post_subject.html.erb +6 -1
- data/app/views/notifications/activities/_update_body.html.erb +5 -1
- data/app/views/notifications/activities/_update_subject.html.erb +5 -1
- data/app/views/posts/_post_focus_search.html.erb +37 -3
- data/app/views/posts/_post_global_search.html.erb +2 -0
- data/app/views/profiles/_contact.html.erb +1 -1
- data/app/views/search/index.js.erb +2 -0
- data/app/views/toolbar/_home.html.erb +4 -0
- data/config/locales/en.yml +26 -0
- data/config/locales/es.yml +26 -0
- data/lib/mailboxer/notification_decoder.rb +8 -6
- data/lib/social_stream-base.rb +1 -1
- data/lib/social_stream/base/version.rb +1 -1
- data/lib/social_stream/migrations/components.rb +1 -1
- data/lib/social_stream/toolbar_config/base.rb +12 -1
- data/social_stream-base.gemspec +1 -1
- data/spec/controllers/contacts_controller_spec.rb +4 -4
- metadata +8 -9
- data/app/views/groups/_new_activity.html.erb +0 -1
- data/app/views/groups/_new_activity_fields.html.erb +0 -7
@@ -58,12 +58,18 @@ span.ui-helper-hidden {
|
|
58
58
|
}
|
59
59
|
|
60
60
|
#contact-form label {
|
61
|
-
display: block;
|
62
|
-
font-family: sans-serif;
|
63
61
|
padding: 2px;
|
62
|
+
}
|
63
|
+
|
64
|
+
#contact-form label[for=contact_message] {
|
65
|
+
display: block;
|
64
66
|
margin-left: 20px;
|
65
67
|
}
|
66
68
|
|
69
|
+
#contact-form .new_contact_text_area {
|
70
|
+
width: 99%;
|
71
|
+
}
|
72
|
+
|
67
73
|
span.ui-radio-state-hover, span.ui-checkbox-state-hover {
|
68
74
|
background-position: 0 -114px;
|
69
75
|
}
|
@@ -92,4 +98,3 @@ span.ui-radio-state-checked-hover {
|
|
92
98
|
.checked-option{
|
93
99
|
background-color: $secondary-color;
|
94
100
|
}
|
95
|
-
|
@@ -39,7 +39,7 @@ span.find{ padding-right:5px;}
|
|
39
39
|
#icon_collaborate{ background: transparent url(frontpage/collaborate.png); width:56px; height:57px;}
|
40
40
|
.icon_text{ text-align:center; width:100%; font-weight:bold;}
|
41
41
|
#join_form{ margin: 15px 0px; text-align:center;}
|
42
|
-
#join_form input[type="submit"] {font-size:
|
42
|
+
#join_form input[type="submit"] {font-size: 14px; padding: 6px 10px;}
|
43
43
|
.sentences{ width:80%; display:inline-block; vertical-align:top; padding-top:10px;}
|
44
44
|
.sentences ul,.sentences li{ list-style-type:none; font-size:14px; margin-left:10px; padding-top:3px;}
|
45
45
|
.sentences li.purple{ list-style-image:url("frontpage/purple_sq.png");}
|
@@ -118,7 +118,23 @@
|
|
118
118
|
overflow: hidden;
|
119
119
|
text-align: center;
|
120
120
|
}
|
121
|
-
.subject_search_results
|
121
|
+
.subject_search_results.post {
|
122
|
+
width: 560px;
|
123
|
+
height: 100%;
|
124
|
+
overflow: hidden;
|
125
|
+
text-align: center;
|
126
|
+
}
|
127
|
+
.subject_search_results.post .activity_objects a,.subject_search_results .brief a{
|
128
|
+
text-decoration: none;
|
129
|
+
color: inherit;
|
130
|
+
}
|
131
|
+
.subject_search_results .post.content_size {
|
132
|
+
word-wrap: break-word;
|
133
|
+
}
|
134
|
+
.subject_search_results .logo {
|
135
|
+
display:inline-block;
|
136
|
+
}
|
137
|
+
.subject_search_results .logo img {
|
122
138
|
width: 48px;
|
123
139
|
height: 48px;
|
124
140
|
}
|
@@ -23,11 +23,8 @@ class ContactsController < ApplicationController
|
|
23
23
|
|
24
24
|
def update
|
25
25
|
# FIXME: This should be in the model
|
26
|
-
|
27
|
-
|
28
|
-
params[:contact][:relation_ids].blank?
|
29
|
-
params[:contact][:relation_ids] << @contact.sender.relation_public.id
|
30
|
-
end
|
26
|
+
params[:contact][:relation_ids].present? &&
|
27
|
+
params[:contact][:relation_ids].delete("0")
|
31
28
|
|
32
29
|
if @contact.update_attributes(params[:contact])
|
33
30
|
redirect_to @contact.receiver_subject
|
data/app/models/contact.rb
CHANGED
@@ -63,8 +63,8 @@ class Contact < ActiveRecord::Base
|
|
63
63
|
end
|
64
64
|
}
|
65
65
|
|
66
|
-
|
67
66
|
validates_presence_of :sender_id, :receiver_id
|
67
|
+
validates_presence_of :relation_ids, :on => :update
|
68
68
|
validates_uniqueness_of :sender_id, :scope => :receiver_id
|
69
69
|
validates_uniqueness_of :receiver_id, :scope => :sender_id
|
70
70
|
|
@@ -181,7 +181,8 @@ class Contact < ActiveRecord::Base
|
|
181
181
|
end
|
182
182
|
|
183
183
|
def set_inverse
|
184
|
-
|
184
|
+
|
185
|
+
inverse = self.class.sent_by(receiver_id).received_by(sender_id).first
|
185
186
|
|
186
187
|
return if inverse.blank?
|
187
188
|
|
@@ -9,7 +9,7 @@
|
|
9
9
|
<% if user_signed_in? %>
|
10
10
|
·
|
11
11
|
<%= link_to activity.audience_in_words(current_subject, :details => :summary),
|
12
|
-
'
|
12
|
+
'javascript:;',
|
13
13
|
:class => 'activity_audience_summary' %>
|
14
14
|
<div class="activity_audience">
|
15
15
|
<%= activity.audience_in_words(current_subject) %>
|
@@ -1,16 +1,23 @@
|
|
1
1
|
<div id="contact-form">
|
2
2
|
<%= form_for @contact do |f| %>
|
3
|
-
<%= hidden_field_tag "contact[relation_ids][]", "
|
3
|
+
<%= hidden_field_tag "contact[relation_ids][]", "0" %>
|
4
|
+
|
5
|
+
<% if @contact.errors.any? %>
|
6
|
+
<div id="error_explanation">
|
7
|
+
<h2><%= t 'contact.error_count', :count => @contact.errors.count %></h2>
|
8
|
+
|
9
|
+
<ul>
|
10
|
+
<% @contact.errors.full_messages.each do |msg| %>
|
11
|
+
<li><%= msg %></li>
|
12
|
+
<% end %>
|
13
|
+
</ul>
|
14
|
+
</div>
|
15
|
+
<% end %>
|
4
16
|
|
5
17
|
<ul>
|
6
18
|
<% current_subject.relation_customs.each do |relation| %>
|
7
19
|
<li>
|
8
|
-
|
9
|
-
<input id="<%= dom_id relation %>" name="contact[relation_ids][]" value="<%= relation.id %>" type="checkbox" <%= raw('checked="checked"') if @contact.relation_ids.include?(relation.id) %> />
|
10
|
-
<label for="<%= dom_id relation %>">
|
11
|
-
<%= relation.name %>
|
12
|
-
</label>
|
13
|
-
</div>
|
20
|
+
<%= check_box_tag "contact[relation_ids][]", relation.id, f.object.relation_ids.include?(relation.id), :id => "contact_relation_ids_#{ relation.id }" %><%= label_tag "contact_relation_ids_#{ relation.id }", relation.name %>
|
14
21
|
</li>
|
15
22
|
<% end %>
|
16
23
|
</ul>
|
@@ -12,8 +12,8 @@
|
|
12
12
|
<% end %>
|
13
13
|
|
14
14
|
<%= location(
|
15
|
-
link_to(
|
16
|
-
link_to(
|
15
|
+
link_to(t('group.other'), groups_path),
|
16
|
+
link_to(t('group.new.action'), new_group_path)
|
17
17
|
) %>
|
18
18
|
|
19
19
|
<div class="space_center"></div>
|
@@ -15,8 +15,7 @@
|
|
15
15
|
<%= render :partial => 'sidebar_show' %>
|
16
16
|
<% end %>
|
17
17
|
|
18
|
-
<%= location(link_to(
|
19
|
-
content_tag(:span, ( truncate_name sanitize @group.name), :class=>"name_group")))%>
|
18
|
+
<%= location(link_to(t('group.one')+": "+truncate_name(sanitize @group.name)))%>
|
20
19
|
|
21
20
|
<% toolbar :profile => @group %>
|
22
21
|
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<% content_for :sidebar do %>
|
8
8
|
<%= render :partial => "groups/sidebar_index" %>
|
9
9
|
<% end %>
|
10
|
-
<%= location(
|
10
|
+
<%= location(t('browse') +": "+
|
11
11
|
link_to(t('user.by'), users_path) + ", "+
|
12
12
|
content_tag(:b,content_tag(:span, t('group.all'), :id=>'name_group')))%>
|
13
13
|
|
@@ -24,9 +24,7 @@
|
|
24
24
|
<%= link_to t('sign_up'), new_user_registration_path, :class => "register_link" %>
|
25
25
|
<span>|</span>
|
26
26
|
<%= link_to t('forgot_password'), new_user_password_path, :class => "register_link" %>
|
27
|
-
|
28
|
-
<%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
|
29
|
-
<%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
|
27
|
+
<%= render :partial => "frontpage/social_networks" %>
|
30
28
|
</div>
|
31
29
|
<% end -%>
|
32
30
|
</div>
|
@@ -1,5 +1,9 @@
|
|
1
1
|
<% if activity.direct_object.is_a? Actor or activity.direct_object.respond_to? :actor %>
|
2
|
-
|
2
|
+
<%= t('notification.fan')%>
|
3
3
|
<% else %>
|
4
|
-
|
4
|
+
<% if activity.receiver.subject.is_a?(User) %>
|
5
|
+
<%= t('notification.like.user') %>
|
6
|
+
<% else %>
|
7
|
+
<%= t('notification.like.other') %>
|
8
|
+
<% end %>
|
5
9
|
<% end %>
|
@@ -1,3 +1,37 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
<% activity = post.post_activity %>
|
2
|
+
<%= div_for activity, :class => 'super_activity' do %>
|
3
|
+
<div class="actor_logo">
|
4
|
+
<%= link_to image_tag(activity.sender_subject.logo.url(:actor),
|
5
|
+
:alt => activity.sender_subject.name),
|
6
|
+
activity.sender_subject %>
|
7
|
+
</div>
|
8
|
+
<div class="activity_content">
|
9
|
+
<div class="actor_name">
|
10
|
+
<%= activity.title(self) %>
|
11
|
+
</div>
|
12
|
+
<div class="activity_objects">
|
13
|
+
<%= link_to post do%>
|
14
|
+
<% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 180) %>
|
15
|
+
<% if text.length < 400 %>
|
16
|
+
<% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 540 - text.length) %>
|
17
|
+
<% end %>
|
18
|
+
<%= highlight(text,get_search_query_words) %>
|
19
|
+
<% end %>
|
20
|
+
</div>
|
21
|
+
<div class="activity_options">
|
22
|
+
<div class="post_time_ago">
|
23
|
+
<%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %>
|
24
|
+
</div>
|
25
|
+
<% if user_signed_in? %>
|
26
|
+
·
|
27
|
+
<%= link_to activity.audience_in_words(current_subject, :details => :summary),
|
28
|
+
'javascript:;',
|
29
|
+
:class => 'activity_audience_summary' %>
|
30
|
+
<div class="activity_audience">
|
31
|
+
<%= activity.audience_in_words(current_subject) %>
|
32
|
+
</div>
|
33
|
+
<% end %>
|
34
|
+
</div>
|
35
|
+
</div>
|
36
|
+
<% end %>
|
37
|
+
|
@@ -5,11 +5,13 @@
|
|
5
5
|
</div>
|
6
6
|
<div class="sub-block">
|
7
7
|
<div class="brief">
|
8
|
+
<%= link_to post do%>
|
8
9
|
<% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 25) %>
|
9
10
|
<% if text.length < 60 %>
|
10
11
|
<% text = excerpt(strip_tags(post.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) %>
|
11
12
|
<% end %>
|
12
13
|
<%= highlight(text,get_search_query_words) %>
|
14
|
+
<% end %>
|
13
15
|
<br>
|
14
16
|
</div>
|
15
17
|
</div>
|
data/config/locales/en.yml
CHANGED
@@ -17,6 +17,8 @@ en:
|
|
17
17
|
privacy: "Privacy"
|
18
18
|
activerecord:
|
19
19
|
attributes:
|
20
|
+
contact:
|
21
|
+
relation_ids: "Contact type"
|
20
22
|
user:
|
21
23
|
email: "Email"
|
22
24
|
name: "Name"
|
@@ -91,6 +93,9 @@ en:
|
|
91
93
|
edit:
|
92
94
|
title: "Edit contact to %{name}"
|
93
95
|
submit: "Edit contact"
|
96
|
+
error_count:
|
97
|
+
one: "1 error prohibited this contact from being saved:"
|
98
|
+
other: "%{count} errors prohibited this contact from being saved:"
|
94
99
|
graph:
|
95
100
|
one: "Graph"
|
96
101
|
empty: "We're sorry but you don't have any contacts yet. You can try the search box to look for somebody!"
|
@@ -242,14 +247,35 @@ en:
|
|
242
247
|
sentbox: "Sentbox"
|
243
248
|
trash: "Trash"
|
244
249
|
notification:
|
250
|
+
added:
|
251
|
+
other: "%{sender} added %{who} as contact."
|
252
|
+
user: "%{sender} added %{who} as contact."
|
245
253
|
confirm: "Confirm %{sender.name} as contact?"
|
246
254
|
destroy_sure: "Do you want to delete this notification?"
|
255
|
+
fan: "%{sender} is now %{whose} fan."
|
256
|
+
like:
|
257
|
+
other: "%{sender} likes %{whose} %{object.name}."
|
258
|
+
user: "%{sender} likes %{whose} %{object.name}."
|
247
259
|
look: "Take a look at %{sender.name}'s wall"
|
260
|
+
makefriend:
|
261
|
+
other: "%{sender} also added %{who} as contact."
|
262
|
+
user: "%{sender} also added %{who} as contact."
|
248
263
|
one: "Notification"
|
249
264
|
other: "Notifications"
|
265
|
+
post:
|
266
|
+
other: "%{sender} added a %{object} in %{whose} wall."
|
267
|
+
user: "%{sender} added a %{object} in %{whose} wall."
|
250
268
|
read: "Mark as read"
|
251
269
|
read_all: "Mark all as read"
|
252
270
|
unread: "Mark as unread"
|
271
|
+
update:
|
272
|
+
other: "%{sender} updated a %{object} in %{whose} wall."
|
273
|
+
user: "%{sender} updated a %{object} in %{whose} wall."
|
274
|
+
who:
|
275
|
+
user: "you"
|
276
|
+
whose:
|
277
|
+
others: "%{receiver}'s"
|
278
|
+
user: "your"
|
253
279
|
post:
|
254
280
|
confirm_delete: "Delete post?"
|
255
281
|
form:
|
data/config/locales/es.yml
CHANGED
@@ -17,6 +17,8 @@ es:
|
|
17
17
|
privacy: "Privacidad"
|
18
18
|
activerecord:
|
19
19
|
attributes:
|
20
|
+
contact:
|
21
|
+
relation_ids: "El tipo de contacto"
|
20
22
|
user:
|
21
23
|
email: "Correo"
|
22
24
|
name: "Nombre"
|
@@ -90,6 +92,9 @@ es:
|
|
90
92
|
edit:
|
91
93
|
title: "Editar contacto con %{name}"
|
92
94
|
submit: "Editar contacto"
|
95
|
+
error_count:
|
96
|
+
one: "1 error impidió que se guardara este contacto:"
|
97
|
+
other: "%{count} errores impidieron que se guardara este contacto"
|
93
98
|
graph:
|
94
99
|
one: "Gráfico"
|
95
100
|
empty: "Lo sentimos pero aún no tienes contactos, pero ¡puedes probar a buscar en la caja de búsqueda!"
|
@@ -239,14 +244,35 @@ es:
|
|
239
244
|
sentbox: "Salida"
|
240
245
|
trash: "Papelera"
|
241
246
|
notification:
|
247
|
+
added:
|
248
|
+
other: "%{sender} añadió a %{who} como contacto."
|
249
|
+
user: "%{sender} te añadió como contacto."
|
242
250
|
confirm: "¿Confirmar contacto con %{sender.name}?"
|
243
251
|
destroy_sure: "¿Borrar notificación?"
|
252
|
+
fan: "%{sender} es ahora fan %{whose}."
|
253
|
+
like:
|
254
|
+
other: "A %{sender} le gusta el %{object.name} %{whose}."
|
255
|
+
user: "A %{sender} le gusta tu %{object.name}."
|
244
256
|
look: "Écha un vistazo al muro de %{sender.name}"
|
257
|
+
makefriend:
|
258
|
+
other: "%{sender} también añadió a %{who} como contacto."
|
259
|
+
user: "%{sender} también te añadió como contacto."
|
245
260
|
one: "Notificación"
|
246
261
|
other: "Notificaciones"
|
262
|
+
post:
|
263
|
+
other: "%{sender} añadió %{object} en el muro %{whose}."
|
264
|
+
user: "%{sender} añadió %{object} en tu muro."
|
247
265
|
read: "Marcar como leída"
|
248
266
|
read_all: "Marcar todas como leídas"
|
249
267
|
unread: "Marcar como no leídas"
|
268
|
+
update:
|
269
|
+
other: "%{sender} actualizó %{object} en el muro %{whose}."
|
270
|
+
user: "%{sender} actualizó %{object} en tu muro."
|
271
|
+
who:
|
272
|
+
user: "tú"
|
273
|
+
whose:
|
274
|
+
user: "tuyo"
|
275
|
+
others: "de %{receiver}"
|
250
276
|
post:
|
251
277
|
confirm_delete: "¿Borrar texto?"
|
252
278
|
form:
|
@@ -13,10 +13,11 @@ module Mailboxer
|
|
13
13
|
notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
|
14
14
|
|
15
15
|
if activity.receiver.subject.is_a?(User)
|
16
|
-
notification_text = notification_text.gsub(/\%\{whose\}/,
|
17
|
-
notification_text = notification_text.gsub(/\%\{who\}/,
|
16
|
+
notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
|
17
|
+
notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
|
18
18
|
else
|
19
|
-
notification_text = notification_text.gsub(/\%\{whose\}/,
|
19
|
+
notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others',
|
20
|
+
:receiver => truncate_name(activity.receiver.name)))
|
20
21
|
notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
|
21
22
|
end
|
22
23
|
|
@@ -49,10 +50,11 @@ module Mailboxer
|
|
49
50
|
notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
|
50
51
|
|
51
52
|
if activity.receiver.subject.is_a?(User)
|
52
|
-
notification_text = notification_text.gsub(/\%\{whose\}/,
|
53
|
-
notification_text = notification_text.gsub(/\%\{who\}/,
|
53
|
+
notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.user'))
|
54
|
+
notification_text = notification_text.gsub(/\%\{who\}/,t('notification.who.user'))
|
54
55
|
else
|
55
|
-
notification_text = notification_text.gsub(/\%\{whose\}/,
|
56
|
+
notification_text = notification_text.gsub(/\%\{whose\}/,t('notification.whose.others',
|
57
|
+
:receiver => truncate_name(activity.receiver.name)))
|
56
58
|
notification_text = notification_text.gsub(/\%\{who\}/,truncate_name(activity.receiver.name))
|
57
59
|
end
|
58
60
|
|
data/lib/social_stream-base.rb
CHANGED
@@ -4,7 +4,7 @@ module SocialStream
|
|
4
4
|
module Migrations
|
5
5
|
class Components < Base
|
6
6
|
def initialize
|
7
|
-
@component = find_migration("social_stream-#{ self.class.name.split('::').last.
|
7
|
+
@component = find_migration("social_stream-#{ self.class.name.split('::').last.underscore }")
|
8
8
|
end
|
9
9
|
|
10
10
|
def up(options = {})
|
@@ -4,7 +4,7 @@ module SocialStream
|
|
4
4
|
# Base toolbar items
|
5
5
|
def home_toolbar_items
|
6
6
|
Array.new.tap do |items|
|
7
|
-
|
7
|
+
#Contacts
|
8
8
|
items << {
|
9
9
|
:key => :contacts,
|
10
10
|
:name => image_tag("btn/btn_friend.png")+t('contact.other'),
|
@@ -17,6 +17,17 @@ module SocialStream
|
|
17
17
|
{:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
|
18
18
|
]
|
19
19
|
}
|
20
|
+
|
21
|
+
# Groups
|
22
|
+
items << {
|
23
|
+
:key => :groups,
|
24
|
+
:name => image_tag("btn/btn_group.png") + t('group.other'),
|
25
|
+
:url => '#',
|
26
|
+
:options => { :link => { :id => "groups_menu" } },
|
27
|
+
:items => [
|
28
|
+
{:key => :new_group ,:name => image_tag("btn/btn_group.png")+t('group.new.action'),:url => new_group_path}
|
29
|
+
]
|
30
|
+
}
|
20
31
|
end
|
21
32
|
end
|
22
33
|
|
data/social_stream-base.gemspec
CHANGED
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
|
|
26
26
|
# Slug generation
|
27
27
|
s.add_runtime_dependency('stringex', '~> 1.3.0')
|
28
28
|
# Avatar attachments
|
29
|
-
s.add_runtime_dependency('avatars_for_rails', '~> 0.1.
|
29
|
+
s.add_runtime_dependency('avatars_for_rails', '~> 0.1.5')
|
30
30
|
# jQuery
|
31
31
|
s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
|
32
32
|
# Authorization
|
@@ -28,7 +28,7 @@ describe ContactsController do
|
|
28
28
|
sign_in @user
|
29
29
|
|
30
30
|
put :update, :id => @tie.contact_id,
|
31
|
-
:contact => { "relation_ids" => [
|
31
|
+
:contact => { "relation_ids" => [ @user.relations.last.id ] }
|
32
32
|
|
33
33
|
response.should redirect_to(@tie.receiver_subject)
|
34
34
|
@user.reload.
|
@@ -46,7 +46,7 @@ describe ContactsController do
|
|
46
46
|
|
47
47
|
|
48
48
|
put :update, :id => contact.id,
|
49
|
-
:contact => { :relation_ids => [
|
49
|
+
:contact => { :relation_ids => [ @user.relations.last.id ],
|
50
50
|
:message => "Testing" }
|
51
51
|
|
52
52
|
response.should redirect_to(contact.receiver_subject)
|
@@ -67,7 +67,7 @@ describe ContactsController do
|
|
67
67
|
|
68
68
|
|
69
69
|
put :update, :id => contact.id,
|
70
|
-
:contact => { :relation_ids =>
|
70
|
+
:contact => { :relation_ids => relations.map(&:id),
|
71
71
|
:message => "Testing" }
|
72
72
|
|
73
73
|
response.should redirect_to(contact.receiver_subject)
|
@@ -96,7 +96,7 @@ describe ContactsController do
|
|
96
96
|
sign_in @user
|
97
97
|
|
98
98
|
put :update, :id => @contact,
|
99
|
-
:contact => { "relation_ids" => [
|
99
|
+
:contact => { "relation_ids" => [ @user.relations.last.id ] }
|
100
100
|
|
101
101
|
response.should redirect_to(home_path)
|
102
102
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: social_stream-base
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 29
|
5
5
|
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 9
|
9
|
-
-
|
10
|
-
version: 0.9.
|
9
|
+
- 19
|
10
|
+
version: 0.9.19
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- GING - DIT - UPM
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2011-10-
|
19
|
+
date: 2011-10-13 00:00:00 +02:00
|
20
20
|
default_executable:
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
@@ -123,12 +123,12 @@ dependencies:
|
|
123
123
|
requirements:
|
124
124
|
- - ~>
|
125
125
|
- !ruby/object:Gem::Version
|
126
|
-
hash:
|
126
|
+
hash: 17
|
127
127
|
segments:
|
128
128
|
- 0
|
129
129
|
- 1
|
130
|
-
-
|
131
|
-
version: 0.1.
|
130
|
+
- 5
|
131
|
+
version: 0.1.5
|
132
132
|
type: :runtime
|
133
133
|
version_requirements: *id007
|
134
134
|
- !ruby/object:Gem::Dependency
|
@@ -798,6 +798,7 @@ files:
|
|
798
798
|
- app/views/devise/sessions/new.html.erb
|
799
799
|
- app/views/devise/shared/_links.erb
|
800
800
|
- app/views/frontpage/_caracteristics.html.erb
|
801
|
+
- app/views/frontpage/_social_networks.html.erb
|
801
802
|
- app/views/frontpage/_sponsor.html.erb
|
802
803
|
- app/views/frontpage/host_meta.xml.builder
|
803
804
|
- app/views/frontpage/index.html.erb
|
@@ -807,8 +808,6 @@ files:
|
|
807
808
|
- app/views/groups/_group_with_details.html.erb
|
808
809
|
- app/views/groups/_index.html.erb
|
809
810
|
- app/views/groups/_new.html.erb
|
810
|
-
- app/views/groups/_new_activity.html.erb
|
811
|
-
- app/views/groups/_new_activity_fields.html.erb
|
812
811
|
- app/views/groups/_show.html.erb
|
813
812
|
- app/views/groups/_sidebar_index.html.erb
|
814
813
|
- app/views/groups/_sidebar_show.html.erb
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Group.new, :remote => false} %>
|