Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Conflicts: config/environments/development.rb
2012-03-01 10:13:49 +08:00
commit 7f05f21930
@@ -1,5 +1,5 @@
 {
-	"title": "Announcement",
+	"title": "announcement",
  "version": "0.1",
  "organization": "Rulingcom",
  "author": "RD dep",
@@ -105,7 +105,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
 	end

    respond_to do |format|
-      if @bulletin.update_attributes(params[:bulletin])
+      if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save
        # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) }
        format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
 		format.js  { render 'toggle_enable' }
@@ -145,7 +145,13 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
  protected
  
  def get_categorys(id = nil)
-    @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+    @bulletin_categorys = []
+    if(is_manager? || is_admin?)
+      @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+    elsif is_sub_manager?
+      @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
+    end
+<<<<<<< HEAD
  end

  def get_sorted_bulletins
@@ -190,6 +196,8 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
        a.flatten!
        a.uniq
     end
+=======
+>>>>>>> 26cd6951dba43b1f6eaf5056160309c5c77a8716
  end
  
  
@@ -0,0 +1,38 @@
+class Panel::Announcement::BackEnd::FactChecksController  < OrbitBackendController
+  before_filter :authenticate_user!
+  include AdminHelper
+  layout 'admin'
+  
+  def index
+    @bulletin_categorys_submit_new = []
+    @bulletin_categorys_check =[]
+    if is_admin? || is_manager?
+      #@bulletin_categorys_submit_new = BulletinCategory.all
+      @bulletin_categorys_check = BulletinCategory.all
+    # elsif is_sub_manager?
+    #   @bulletin_categorys_submit_new = BulletinCategory.authed_for_user(current_user,'submit_new')
+    #   @bulletin_categorys_check = BulletinCategory.authed_for_user(current_user,'fact_check')
+    end
+  end
+  
+  def new
+    
+  end
+  
+  def create
+    
+  end
+  
+  def update
+    
+  end
+  
+  def edit
+    
+  end
+  
+  def destroy
+    
+  end
+  
+end
@@ -17,7 +17,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
      @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
    end

-	get_categorys
+	  get_categorys
+	  
+	  @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil
  end
  
  def show
@@ -4,7 +4,7 @@ class Bulletin
  include Mongoid::Document
  include Mongoid::Timestamps
  include Mongoid::MultiParameterAttributes
-  
+
  has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
  has_one :subtitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
  has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
@@ -3,6 +3,10 @@
 class BulletinCategory
  include Mongoid::Document
  include Mongoid::Timestamps
+  include OrbitCoreLib::ObjectAuthable
+  
+  ObjectAuthTitlesOptions = %W{submit_new fact_check}
+  AfterObjectAuthUrl = '/panel/announcement/back_end/bulletin_categorys'
  # include Mongoid::MultiParameterAttributes
  
  PAYMENT_TYPES = [ "List", "Picture" ]
@@ -14,4 +18,8 @@ class BulletinCategory
  
  has_many :bulletins
  
+  def self.from_id(id)
+    BulletinCategory.find(id) rescue nil
+  end
+  
 end
@@ -5,7 +5,15 @@
 	<td><%= bulletin_category.i18n_variable[locale] rescue nil %></td>
 	<% end %>
 	<td><%= bulletin_category.display %></td>
-	<td>
+	<% if is_manager? %>
+		<td>
+		<%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>  <br/ >
+		<% bulletin_category.object_auths.each do |obj_auth| %>
+			 <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token)  %><br />
+		<% end %>
+		</td>
+		<td>
+	<% end %>	
 	<%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %> |
 	<%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %> |
 	<%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
@@ -1,22 +1,17 @@
 <% content_for :secondary do %>
-<br />
-<br />
-<br />
-<br />
-<br />
-  <ul class="list">
-	  <li><%#= link_to t('bulletin_category.new_announcement_class'), new_panel_announcement_back_end_bulletin_category_path, :class => 'seclink1' %></li>
-  </ul>
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
 <% end -%>

 <%= flash_messages %>

+<br />
+<br />
+<br />
+<br />
+<br />
+
 <h1><%= t('bulletin_category.list_announcement_class') %></h1>
-<br />
-<br />
-<br />
-<br />
-<br />
+
 <table id="bulletin_categorys">
  <tr>
    <th><%= t('bulletin_category.key') %></th>
@@ -1,15 +1,15 @@
-<br />
-<br />
-<br />
-<br />
-
 <% content_for :secondary do %>
-  <ul class="list">
-	  <li><%= link_to t('bulletin_category.index'), panel_announcement_back_end_bulletin_categorys_path, :class => 'seclink2' %></li>
-  </ul>
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
 <% end -%>

 <%= flash_messages %>
+
+<br />
+<br />
+<br />
+<br />
+<br />
+
 <h1><%= t('bulletin_category.new_announcement_class') %></h1>
 <%= form_for @bulletin_category, :url => panel_announcement_back_end_bulletin_categorys_path do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
@@ -36,4 +36,4 @@
 </thead>
 <tbody class="sort-holder">
 	<%= render :partial => 'bulletin', :collection => @bulletins %>
-</tbody>
+</tbody>
@@ -4,4 +4,4 @@
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

-<%= link_back %>
+<%= link_back %>
@@ -6,4 +6,3 @@
 <div class="form-actions">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary' %>
 </div>
-
@@ -1,6 +1,5 @@
-
 <%= form_for @bulletin, :url => panel_announcement_back_end_bulletins_path do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

-<%= link_back %>
+<%= link_back %>
@@ -1,10 +1,14 @@
-<% # encoding: utf-8 %>
+<% content_for :secondary do %>
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
+<% end -%>
+
+<%= flash_messages %>

 <br />
 <br />
 <br />
-
-<p id="notice"><%= flash_messages %></p>
+<br />
+<br />

 <ul>
 	<li>
@@ -0,0 +1,15 @@
+<h1><%= bulletin_category.key %></h1>
+<table>
+  <tr>
+	<th><%= t('bulletin.status') %></th>
+	<th><%= t('bulletin.category') %></th>
+	<th><%= t('bulletin.title') %></th>
+	<th><%= t('bulletin.postdate') %></th>
+	<th><%= t('bulletin.deadline') %></th>
+	<th><%= t('bulletin.action') %></th>
+  </tr>
+
+<% bulletin_category.bulletins.each do |post| %>
+	<%= render :partial => 'panel/announcement/back_end/bulletins/bulletins', :locals => {:post => post,:fact_check_allow=>true} %>
+<% end %>	
+</table>
@@ -0,0 +1,40 @@
+<% content_for :secondary do %>
+<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
+<% end -%>
+
+<%= flash_messages %>
+
+<br />
+<br />
+<br />
+<br />
+<br />
+  
+  <fieldset><legend><%= t('bulletin.search') %></legend>	
+
+  <%= form_for :bulletin, :action => 'search', :method => 'get', :url => panel_announcement_back_end_bulletins_path do |f| %>
+  
+  <%#= f.select :bulletin_category_id, @bulletin_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ] },{ :include_blank => t('bulletin.select') }%>
+  
+  Category <%#= select_tag "category_id", options_for_select(@bulletin_categorys.collect{|t| [t.i18n_variable[I18n.locale], t.id]}), :prompt => t('bulletin.select') %>
+  
+  KeyWord <%#= text_field_tag :search, params[:search], :id => 'search_field' %>
+  
+  <%= submit_tag "Search", :name => nil %> 
+  
+  <% end %>
+
+  
+  </fieldset>
+
+<br />
+<br />
+
+<h1><%= t('bulletin.list_announcement') %></h1>
+
+<div id="check_block">	
+	<h1>Check Please</h1>
+	<%= render :partial => "list_table", :collection => @bulletin_categorys_check,:as => :bulletin_category%>
+</div>
+<br />
+
@@ -2,7 +2,11 @@

 <%= flash_messages %>

-<h1 class="h1"><%= t('announcement.list_announcement') %></h1>
+<% if @current_category %>
+	<h1 class="h1"><%= @current_category.i18n_variable[I18n.locale] + t('announcement.bulletin.list_lower') %></h1>
+<% else %>
+	<h1 class="h1"><%= t('announcement.list_announcement') %></h1>
+<% end %>


 <table class="table table-bordered">
@@ -11,7 +11,7 @@
 		<li>
 			<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
 			<h3 class="h3 news_title"><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %></h3>
-			<p class="news_wrap"><%= post.subtitle[I18n.locale] %></p>
+			<p class="news_wrap"><%= post.subtitle[I18n.locale].html_safe %></p>
 		</li>
 		<% end %>
 	</ul>
@@ -32,6 +32,7 @@ en:
    list_announcement: List Announcement
    bulletin:
      category: Category
+      list_lower: " list"
      title: Title
      postdate: Postdate
  # admin:
@@ -27,6 +27,7 @@ zh_tw:
    list_announcement: 公告列表
    bulletin:
      category: 分類
+      list_lower: 列表
      title: 標題
      postdate: 張貼日期
 #  admin:
@@ -2,6 +2,9 @@ Rails.application.routes.draw do
  namespace :panel do
    namespace :announcement do
      namespace :back_end do
+        match 'public' => "announcements#public",:as => :public
+        resources :fact_checks
+        match 'list_mine' => "announcements#list_mine"
        root :to => "bulletins#index"
        resources :bulletins
        resources :bulletin_categorys, :controller => 'bulletin_categorys' do
@@ -21,4 +24,4 @@ Rails.application.routes.draw do
      end
    end
  end
-end
+end
@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :announcement do
-#   # Task goes here
-# end
@@ -1,4 +1,4 @@
-class Panel::NewBlog::FrontEnd::CommentsController < ObitFrontendController
+class Panel::NewBlog::FrontEnd::CommentsController < OrbitFrontendController
  def create
    @post = Post.find(params[:post_id])
    @comment = @post.comments.create!(params[:comment])
@@ -1,4 +1,4 @@
-class Panel::NewBlog::FrontEnd::PostsController < ObitFrontendController
+class Panel::NewBlog::FrontEnd::PostsController < OrbitFrontendController
  # GET /posts
  # GET /posts.xml
  def index
@@ -14,7 +14,7 @@ class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
  
    # @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :name).first

-    @web_links = WebLink.widget_datas.page(params[:page]).per(9)
+    @web_links = WebLink.widget_datas.page(params[:page]).per(5)
 	
 	# get_categorys
  	
@@ -24,7 +24,7 @@ class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
  end

  def reload_web_links
-    @web_links = WebLink.widget_datas.page(params[:page]).per(9)
+    @web_links = WebLink.widget_datas.page(params[:page]).per(5)
  end