for openness

This commit is contained in:
Matthew K. Fu JuYuan committed 2012-11-20 20:20:59 +08:00
1 parent 6273300c28
commit 96fe482d50
7 files changed
+23 -15

No files matched your search

@@ -18,9 +18,14 @@ module Panel::Announcement::BackEnd::BulletinsHelper
end
def show_delete_link(bulletin)
by_bulletin = (bulletin.create_user_id == current_user.id)
by_user = (is_manager? or is_admin?)
by_bulletin or by_user
if !current_user.nil?
by_bulletin = (bulletin.create_user_id == current_user.id )
by_user = (is_manager? or is_admin?)
by_bulletin or by_user
else
false
end
end
def show_bulletin_title_at_index (bulletin)
@@ -221,7 +221,7 @@
<span>or</span>
<label class="file-select" for="fileselect">select from a folder
<!-- <input type="file" class="upload" id="fileselect" name="fileselect[]" multiple="multiple" /> -->
<%= f.fields_for @bulletin.bulletin_files.build, do |f| %>
<%= f.fields_for @bulletin.bulletin_files.build do |f| %>
<%= f.file_field :file, :multiple => true, :class => 'upload', :id => 'fileselect' %>
<% end %>
</label>
@@ -56,7 +56,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
@news_bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered("news_bulletin",:news_bulletin_category_id.in => @news_bulletin_category_ids) : get_viewable("news_bulletin",:news_bulletin_category_id.in => @news_bulletin_category_ids)
@news_bulletin_link = NewsBulletinLink.new
@link_url = panel_news_back_end_news_bulletins_path
@@ -17,7 +17,7 @@ module Panel::News::BackEnd::NewsBulletinsHelper
end
def news_show_delete_link(news_bulletin)
by_news_bulletin = (news_bulletin.create_user_id == current_user.id)
by_news_bulletin = current_user.nil? ? false : (news_bulletin.create_user_id == current_user.id)
by_user = (is_manager? or is_admin?)
by_news_bulletin or by_user
end