enju_news 0.1.0.pre2 → 0.1.0.pre3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5697b218da9d2850ccad0aed81b690dead11367a
+  data.tar.gz: 7ac66fa6bb03f51c1987483fdaaafcf0903e3468
+SHA512:
+  metadata.gz: 97ea6d0013f698d6f65f8035b40a410b2267dcd70f787574855c0ac13f23a15116eec01d779162d6508ded1a4ea2282ae1e805bafa97b2e3095b7a8ae65900a2
+  data.tar.gz: 3ffc2306d269efe8772b95916696540c24bbbcbfc35b43f17ad0212f52c5a3e0b3f5466997a288698457fcfb473d38adda73706e28735d151bf2039a251b7d5b

data/app/controllers/news_posts_controller.rb

@@ -92,6 +92,7 @@ class NewsPostsController < ApplicationController
     end
   end
 
+  private
   def prepare_options
     @roles = Role.all
   end

data/app/models/enju_news/ability.rb

@@ -0,0 +1,18 @@
+module EnjuNews
+  class Ability
+    include CanCan::Ability
+    
+    def initialize(user, ip_address = nil)
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can :manage, [NewsFeed, NewsPost]
+      when 'Librarian'
+        can :read, [NewsFeed, NewsPost]
+      when 'User'
+        can :read, [NewsPost]
+      else
+        can :read, [NewsPost]
+      end
+    end
+  end
+end

data/app/models/news_feed.rb

@@ -81,3 +81,18 @@ class NewsFeed < ActiveRecord::Base
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: news_feeds
+#
+#  id               :integer          not null, primary key
+#  library_group_id :integer          default(1), not null
+#  title            :string(255)
+#  url              :string(255)
+#  body             :text
+#  position         :integer
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+

data/app/models/news_post.rb

@@ -14,3 +14,23 @@ class NewsPost < ActiveRecord::Base
     10
   end
 end
+
+# == Schema Information
+#
+# Table name: news_posts
+#
+#  id               :integer          not null, primary key
+#  title            :text
+#  body             :text
+#  user_id          :integer
+#  start_date       :datetime
+#  end_date         :datetime
+#  required_role_id :integer          default(1), not null
+#  note             :text
+#  position         :integer
+#  draft            :boolean          default(FALSE), not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  url              :string(255)
+#
+

data/app/views/news_feeds/index.html.erb

@@ -13,14 +13,14 @@
 <%- @news_feeds.each do |news_feed| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :destroy, news_feed -%>
+      <%- if can? :delete, news_feed -%>
         <%= move_position(news_feed) -%>
       <%- end -%>
     </td>
     <td><%= link_to h(news_feed.title), news_feed -%></td>
     <td><%= link_to h(news_feed.url), news_feed.url -%></td>
     <td>
-      <%- if can? :destroy, news_feed -%>
+      <%- if can? :delete, news_feed -%>
         <%= link_to t('page.edit'), edit_news_feed_path(news_feed) -%>
         <%= link_to t('page.destroy'), news_feed, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>

data/app/views/news_posts/_form.html.erb

@@ -15,7 +15,7 @@
   <!--
   <div class="field">
     <%= f.label t('activerecord.models.user') -%><br />
-    <%= link_to h(@news_post.user.username), user_path(@news_post.user.username) -%>
+    <%= link_to h(@news_post.user.username), @news_post.user -%>
   </div>
   <div class="field">
     <%= f.label t('role.required_role') -%>

data/app/views/news_posts/index.html.erb

@@ -22,7 +22,7 @@
     </td>
     <td><%= news_post.required_role.display_name.localize -%></td>
     <td>
-      <% if can? :destroy, news_post %>
+      <% if can? :delete, news_post %>
         <%= link_to t('page.edit'), edit_news_post_path(news_post) -%>
         <%= link_to t('page.destroy'), news_post, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>

data/lib/enju_news/version.rb

@@ -1,3 +1,3 @@
 module EnjuNews
-  VERSION = "0.1.0.pre2"
+  VERSION = "0.1.0.pre3"
 end