social_stream-documents 0.16.1 → 0.17.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -7,10 +7,10 @@
7
7
  <div id="actions">
8
8
  <%= link_to content_tag(:span,image_tag("btn/btn_write.png") + t('document.actions.details'), :class => :action, :id => :document_details_action), "javascript:SocialStream.Repository.toggleDocumentMenu('details');" %>
9
9
  <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
10
- <% if document.post_activity.edit_object_by?(current_subject) %>
10
+ <% if can? :update, document %>
11
11
  <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:SocialStream.Repository.toggleDocumentMenu('edit');" %>
12
12
  <% end %>
13
- <% if document.post_activity.delete_object_by?(current_subject) %>
13
+ <% if can? :destroy, document %>
14
14
  <%= link_to content_tag(:span,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
15
15
  :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
16
16
  <% end %>
@@ -18,10 +18,10 @@
18
18
  <div class="tipsy_content" style="display:none;">
19
19
  <div class="actions">
20
20
  <%= link_to content_tag(:div,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
21
- <% if document.post_activity.edit_object_by?(current_subject) %>
21
+ <% if can? :update, document %>
22
22
  <%= link_to content_tag(:div,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), document_path(document, :editing => true) %>
23
23
  <% end %>
24
- <% if document.post_activity.delete_object_by?(current_subject) %>
24
+ <% if can? :destroy, document %>
25
25
  <%= link_to content_tag(:div,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
26
26
  :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
27
27
  <% end %>
@@ -54,6 +54,13 @@ module SocialStream
54
54
  Mime::Type.register "video/mp4", :mp4
55
55
  end
56
56
 
57
+ initializer "social_stream-documents.model.register_activity_streams" do
58
+ SocialStream::ActivityStreams.register :file, :document
59
+ SocialStream::ActivityStreams.register :image, :picture
60
+ SocialStream::ActivityStreams.register :audio
61
+ SocialStream::ActivityStreams.register :video
62
+ end
63
+
57
64
  initializer "social_stream-documents.views.toolbar" do
58
65
  SocialStream::Views::Toolbar.module_eval do
59
66
  include SocialStream::Views::Toolbar::Documents
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Documents
3
- VERSION = "0.16.1".freeze
3
+ VERSION = "0.17.0".freeze
4
4
  end
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 0.22.3')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.23.0')
16
16
  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
17
17
  s.add_runtime_dependency('paperclip','= 2.4.5')
18
18
  s.add_runtime_dependency('delayed_paperclip','2.4.5.1')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-documents
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.1
4
+ version: 0.17.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-09-18 00:00:00.000000000 Z
13
+ date: 2012-10-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.22.3
22
+ version: 0.23.0
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
27
27
  requirements:
28
28
  - - ~>
29
29
  - !ruby/object:Gem::Version
30
- version: 0.22.3
30
+ version: 0.23.0
31
31
  - !ruby/object:Gem::Dependency
32
32
  name: paperclip-ffmpeg
33
33
  requirement: !ruby/object:Gem::Requirement