fix
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人，應該只能看到自己發佈的新聞&公告，但是目前可以看到全部，而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時，發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion. may need to run:
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
This commit is contained in:
Matthew K. Fu JuYuan committed
1 parent
a36f73bafc
commit
ffd95ee1fd
16 files changed
+49
-37
No files matched your search
Vendored
+6
@@ -6,4 +6,10 @@ module Panel::Announcement::BackEnd::BulletinsHelper
|
||||
by_bulletin and by_user
|
||||
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
|
||||
end
|
||||
|
||||
end
|
||||
+4
-4
@@ -48,12 +48,12 @@
|
||||
<li><%= link_to t(:file), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
|
||||
</ul>
|
||||
</li>
|
||||
<%#= debugger %>
|
||||
<%#= a=1 %>
|
||||
|
||||
<% end %>
|
||||
<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
|
||||
|
||||
<% end -%>
|
||||
<% if show_delete_link(bulletin) %>
|
||||
<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
|
||||
<% end %>
|
||||
<% if show_approval_link(bulletin) %>
|
||||
<li><%= link_to t('announcement.bulletin.approval'), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>
|
||||
<% end %>
|
||||
|
||||
Vendored
+4
-11
@@ -123,7 +123,7 @@
|
||||
<%#= f.label :unit_list_for_anc%>
|
||||
<%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
|
||||
|
||||
<%= f.label :category %>
|
||||
<%= f.label :category,t('announcement.bulletin.category')%>
|
||||
<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
@@ -141,23 +141,16 @@
|
||||
<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
|
||||
|
||||
<div class="title">
|
||||
<%= f.label :title %>
|
||||
<%= f.label :title ,t('announcement.bulletin.title')%>
|
||||
<%= f.fields_for :title, (@bulletin.new_record? ? @bulletin.build_title : @bulletin.title ) do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_field locale, :class=>'post-title' %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="editor">
|
||||
<%= f.label :subtitle %>
|
||||
<%= f.fields_for :subtitle, (@bulletin.new_record? ? @bulletin.build_subtitle : @bulletin.subtitle ) do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="editor">
|
||||
<%= f.label :text %>
|
||||
<%= f.label :text ,t('announcement.bulletin.text')%>
|
||||
<%= f.fields_for :text, (@bulletin.new_record? ? @bulletin.build_text : @bulletin.text ) do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
|
||||
|
||||
@@ -49,6 +49,7 @@ zh_tw:
|
||||
bulletins: 公告訊息
|
||||
related_links: 相關連結
|
||||
bulletin:
|
||||
text: 內文
|
||||
category: 分類
|
||||
submit_user_list: 張貼人
|
||||
list_lower: 列表
|
||||
|
||||
+6
@@ -6,4 +6,10 @@ module Panel::News::BackEnd::NewsBulletinsHelper
|
||||
by_news_bulletin and by_user
|
||||
end
|
||||
|
||||
def news_show_delete_link(news_bulletin)
|
||||
by_news_bulletin = (news_bulletin.create_user_id == current_user.id)
|
||||
by_user = (is_manager? or is_admin?)
|
||||
by_news_bulletin or by_user
|
||||
end
|
||||
|
||||
end
|
||||
+6
-6
@@ -118,10 +118,10 @@
|
||||
<div id="post-body">
|
||||
<div id="post-body-content" class="clear">
|
||||
|
||||
<%= f.label :unit_list_for_anc%>
|
||||
<%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
|
||||
<%= f.label :unit_list_for_anc,t('news.news_bulletin.unit_name')%>
|
||||
<%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {:prompt => t("news.news_bulletin.ut_prompt")}, :class => "input-medium" %>
|
||||
|
||||
<%= f.label :category %>
|
||||
<%= f.label :category,t('news.news_bulletin.category') %>
|
||||
<%= f.select :news_bulletin_category_id, @news_bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
|
||||
|
||||
<ul class="nav nav-tabs">
|
||||
@@ -139,7 +139,7 @@
|
||||
<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
|
||||
|
||||
<div class="title">
|
||||
<%= f.label :title %>
|
||||
<%= f.label :title, t('news.news_bulletin.title')%>
|
||||
<%= f.fields_for :title, (@news_bulletin.new_record? ? @news_bulletin.build_title : @news_bulletin.title ) do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_field locale, :class=>'post-title' %>
|
||||
@@ -147,7 +147,7 @@
|
||||
</div>
|
||||
|
||||
<div class="editor">
|
||||
<%= f.label :subtitle %>
|
||||
<%= f.label :subtitle, t('news.news_bulletin.subtitle') %>
|
||||
<%= f.fields_for :subtitle, (@news_bulletin.new_record? ? @news_bulletin.build_subtitle : @news_bulletin.subtitle ) do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
|
||||
@@ -155,7 +155,7 @@
|
||||
</div>
|
||||
|
||||
<div class="editor">
|
||||
<%= f.label :text %>
|
||||
<%= f.label :text, t('news.news_bulletin.text') %>
|
||||
<%= f.fields_for :text, (@news_bulletin.new_record? ? @news_bulletin.build_text : @news_bulletin.text ) do |f| %>
|
||||
<%= I18nVariable.from_locale(locale) %>
|
||||
<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %>
|
||||
|
||||
Vendored
+2
@@ -52,6 +52,8 @@
|
||||
<%#= a=1 %>
|
||||
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if news_show_delete_link(news_bulletin) %>
|
||||
<li class="dropdown"><%= link_to t('news_bulletin.delete'), panel_news_back_end_news_bulletin_path(news_bulletin), :confirm => t('news.sure?'), :method => :delete, :remote => true %></li>
|
||||
<% end %>
|
||||
<% if news_show_approval_link(news_bulletin) %>
|
||||
|
||||
@@ -65,6 +65,7 @@ en:
|
||||
related_links: Related Links
|
||||
news: News
|
||||
news_bulletin:
|
||||
ut_prompt: Please select UT
|
||||
category: Category
|
||||
list_lower: " list"
|
||||
title: Title
|
||||
|
||||
@@ -47,9 +47,13 @@ zh_tw:
|
||||
related_links: 相關連結
|
||||
news: 新聞
|
||||
news_bulletin:
|
||||
ut_prompt: 請選擇單位
|
||||
category: 分類
|
||||
list_lower: 列表
|
||||
title: 標題
|
||||
subtitle: 副標題
|
||||
text: 內文
|
||||
unit_name: 發佈單位
|
||||
postdate: 張貼日期
|
||||
approval: 新聞審核
|
||||
approval_setting: 審核設定
|
||||
|
||||
Reference in new issue
Block a user