muck-services 0.1.22 → 0.1.23

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.22
1
+ 0.1.23
@@ -99,6 +99,7 @@ class Muck::FeedsController < ApplicationController
99
99
  def has_permission_to_add_feed(user, parent)
100
100
  return false if user.blank?
101
101
  return true if user.admin?
102
+ return true if user.can_add_feeds?
102
103
  return false if parent.blank?
103
104
  user == parent || parent.can_add_feed?(user)
104
105
  end
@@ -17,7 +17,7 @@ module MuckServicesFeedsHelper
17
17
  admin = Feed.find_by_login('admin')
18
18
  'unknown'
19
19
  else
20
- link_to feed.contributor.display_name, user_path(feed.contributor_id)
20
+ link_to feed.contributor.display_name, profile_path(feed.contributor)
21
21
  end
22
22
  end
23
23
 
@@ -24,6 +24,11 @@ module ActiveRecord
24
24
  end
25
25
 
26
26
  module InstanceMethods
27
+
28
+ # Override this method to define whether or not a user can add feeds.
29
+ def can_add_feeds?
30
+ false
31
+ end
27
32
  end
28
33
 
29
34
  end
@@ -54,6 +54,7 @@ en:
54
54
  all_resources: All Resources
55
55
  only_courses: Only Courses
56
56
  add_feed: Add
57
+ feed_display_address: 'Feed Url'
57
58
  add_feed_url: "Url:"
58
59
  discover_feed_message: "Searching for information about the url you provided. Please wait."
59
60
  select_feeds_prompt: "Select the feeds you would like to add:"
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{muck-services}
8
- s.version = "0.1.22"
8
+ s.version = "0.1.23"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Joel Duffin", "Justin Ball"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: muck-services
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.22
4
+ version: 0.1.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joel Duffin