Download as
Browse Code »

Commit 0ff468160e11270af7178d2494d0d6dabde20a6e

Authored by Dmitriy Zaporozhets
1 parent f03dc871
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed event.allowed? with event.proper?

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/views/dashboard/index.atom.builder
  Diff comments   View file @0ff4681
... ... @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
7 7 xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
8 8  
9 9 @events.each do |event|
10   - if event.allowed?
  10 + if event.proper?
11 11 event = EventDecorator.decorate(event)
12 12 xml.entry do
13 13 event_link = event.feed_url
... ...
app/views/groups/show.atom.builder
  Diff comments   View file @0ff4681
... ... @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
7 7 xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
8 8  
9 9 @events.each do |event|
10   - if event.allowed?
  10 + if event.proper?
11 11 event = EventDecorator.decorate(event)
12 12 xml.entry do
13 13 event_link = event.feed_url
... ...
spec/models/event_spec.rb
  Diff comments   View file @0ff4681
... ... @@ -59,7 +59,7 @@ describe Event do
59 59 end
60 60  
61 61 it { @event.push?.should be_true }
62   - it { @event.allowed?.should be_true }
  62 + it { @event.proper?.should be_true }
63 63 it { @event.new_branch?.should be_true }
64 64 it { @event.tag?.should be_false }
65 65 it { @event.branch_name.should == "master" }
... ...