Changeset 5794

Timestamp:

06/12/08 08:43:36 (2 months ago)

Author:

uta

Message:

2008/06/12 sync

Files:

• components/news/trunk/news/_install/db/001_news_schema_001.rb (modified) (1 diff)
• components/news/trunk/news/_install/db/002_news_schema_002.rb (modified) (1 diff)
• components/news/trunk/news/_install/javascripts/news.js (modified) (7 diffs)
• components/news/trunk/news/_install/javascripts/src_news.js (modified) (4 diffs)
• components/news/trunk/news/admin_category/list.rhtml (modified) (2 diffs)
• components/news/trunk/news/admin_category/main.rhtml (modified) (1 diff)
• components/news/trunk/news/admin_category_controller.rb (modified) (2 diffs)
• components/news/trunk/news/admin_controller.rb (modified) (1 diff)
• components/news/trunk/news/block/list.rhtml (modified) (1 diff)
• components/news/trunk/news/common_helper.rb (modified) (3 diffs)
• components/news/trunk/news/languages/chinese.rb (modified) (4 diffs)
• components/news/trunk/news/news/_item_return_confirm_window.rhtml (modified) (1 diff)
• components/news/trunk/news/news/_main_news_create_window.rhtml (modified) (3 diffs)
• components/news/trunk/news/news/_news_content.rhtml (modified) (2 diffs)
• components/news/trunk/news/news/show_news.rhtml (modified) (5 diffs)
• components/news/trunk/news/news/update.rjs (modified) (1 diff)
• components/news/trunk/news/news_category.rb (modified) (1 diff)
• components/news/trunk/news/news_controller.rb (modified) (10 diffs)
• components/news/trunk/news/news_item.rb (modified) (6 diffs)
• components/news/trunk/news/news_lib.rb (modified) (2 diffs)
• components/news/trunk/news/preload/_preload.rhtml (modified) (1 diff)

components/news/trunk/news/_install/db/001_news_schema_001.rb

@@ -33 +33 @@
-    # Initial Data
-    ####################################################################################################################
-10, :news_per_block => 5
+RubricksLib::LIST_PER_PAGE, :news_per_block => RubricksLib::LIST_PER_PAGE_IN_WINDOW
-  end
-

components/news/trunk/news/_install/db/002_news_schema_002.rb

@@ -1 +1 @@
-class NewsSchema002 < ActiveRecord::Migration
-  def self.up
- :comment,   :string,    :limit => 255,   :default => '',    
+:return_comment, :string, :limit => 255, :default => '',
-  end
-
-  def self.down
- :
+:return_
-  end
-end

components/news/trunk/news/_install/javascripts/news.js

@@ -50 +50 @@
-$("print_news_id").value=_7;
-},item_return_comment_save:function(_9){
-
+
+
-rubricks.common.rubricks_wait_message_close();
-},onLoading:function(_b){
@@ -93 +94 @@
-this.news_create_window.open();
-$("post_news_title").focus();
-},overflow_news_textarea:function(_14,_15,_16){
-if(overflow_textarea(_14,_15)){
-$("rubricks_message").innerHTML=_16;
-rubricks.common.rubricks_message_window.options.modal=false;
-rubricks.common.rubricks_message_window.center();
-rubricks.common.rubricks_message_window.open();
-return true;
-}
-},print_news:function(){
-if(Element.hasClassName("print_button","disabled")){
@@ -107 +100 @@
-rubricks.common.fire_submit("news_print_form","print_button");
-rubricks.common.rubricks_wait_message_close();
-7
+4
-this.news_list.makeMultiple();
-7
-7
-7
-8
-8
-8
-8
+4
+4
+4
+5
+5
+5
+5
-}
-},select_singular_mode:function(){
@@ -121 +114 @@
-this.news_list.makeSingular();
-}
-9
-9
-9
-9
-a,_1b
-c
-a
-a
-c={id:_1a
+6
+6
+6
+6
+7,_18
+9
+7
+7
+9={id:_17
-}
-c,onLoaded:function(_1d
+9,onLoaded:function(_1a
-rubricks.common.rubricks_wait_message_close();
-e
+b
-rubricks.common.rubricks_wait_message_open();
-}});
-},submit_create_news:function(){
-if(this.overflow_news_textarea("post_news_article",10000,this.msg_news_article_max)){
-return false;
-}
-this.close_news_create_window();
-},submit_edit_news:function(){
-if(this.overflow_news_textarea("news_article",10000,this.msg_news_article_max)){
-return false;
-}
-rubricks.common.fire_onsubmit("news_edit_form","news_edit_button","news_edit_area");
-}});
@@ -158 +145 @@
-$("news_category_name").focus();
-},category_window_render:function(id){
-21
+1e
-rubricks.common.rubricks_wait_message_close();
-22
+1f
-rubricks.common.rubricks_wait_message_open();
-}});
@@ -170 +157 @@
-}
-},delete_confirm:function(){
-3
-3
+0
+0
-rubricks.common.rubricks_message_window_open(this.msg_category_not_selected,"error");
-}else{
-3
+0
-if(id==1){
-rubricks.common.rubricks_message_window_open(this.err_delete_default,"error");
@@ -184 +171 @@
-}
-},destroy:function(id){
-6
+3
-rubricks.common.rubricks_wait_message_close();
-7
+4
-rubricks.common.rubricks_wait_message_open();
-}});
-},edit:function(){
-8
-8
+5
+5
-rubricks.common.rubricks_message_window_open(this.msg_category_not_selected,"error");
-}else{
-8
+5
-}
-}});

components/news/trunk/news/_install/javascripts/src_news.js

@@ -79 +79 @@
-  },
-  item_return_comment_save: function(news_id){
+    rubricks.news.news_item_return_comment_window.close();
-    new Ajax.Updater(
-      'news_list_frame',
@@ -85 +86 @@
-        asynchronous:   true,
-        evalScripts:    true,
-
+return_
-        onLoaded:       function(request){rubricks.common.rubricks_wait_message_close();},
-        onLoading:      function(request){rubricks.common.rubricks_wait_message_open();}
@@ -142 +143 @@
-    $('post_news_title').focus();
-  },
-  overflow_news_textarea: function(textarea_name, max_length, message){
-    if(overflow_textarea(textarea_name, max_length)){
-      $('rubricks_message').innerHTML = message;
-      rubricks.common.rubricks_message_window.options.modal = false
-      rubricks.common.rubricks_message_window.center();
-      rubricks.common.rubricks_message_window.open();
-      return true;
-    }
-  },
-  print_news: function() {
-    if(Element.hasClassName('print_button', 'disabled')){
@@ -199 +191 @@
-  },
-  submit_create_news: function(){
-    if(this.overflow_news_textarea('post_news_article', 10000, this.msg_news_article_max)){
-      return false;
-    }
-    this.close_news_create_window();
-  },
-  submit_edit_news: function(){
-    if(this.overflow_news_textarea('news_article', 10000, this.msg_news_article_max)){
-      return false;
-    }
-    rubricks.common.fire_onsubmit('news_edit_form', 'news_edit_button', 'news_edit_area');
-  }

components/news/trunk/news/admin_category/list.rhtml

@@ -2 +2 @@
-  <thead>
-    <tr>
-
-
-
-
-
-
+
+
-    </tr>
-  </thead>
@@ -23 +19 @@
-  </tbody>
-<% end %>
+<br class="cl" />

components/news/trunk/news/admin_category/main.rhtml

@@ -18 +18 @@
-        <div id="news_category_frame">
-          <%= simple_render_component('/news/admin_category', 'list', {}) %>
-          <br class="cl" />
-        </div>
-      <% end %>

components/news/trunk/news/admin_category_controller.rb

@@ -26 +26 @@
-      end
-    rescue Exception => ex
-
-
-
-
-
-
-
+
-    end
-    flash[:news_message] = '[_News_Category_MessageDelete]'
@@ -50 +44 @@
-      end
-    rescue Exception => ex
-
-
-
-
-
-
-
-
+
+
-    end
-    flash[:news_message] ||= '[_News_Category_MessageUpdate]'

components/news/trunk/news/admin_controller.rb

@@ -24 +24 @@
-      end
-    rescue Exception => ex
-
-
-
+
-    end
-    flash[:news_message] = '[_News_Admin_MessageUpdate]'

components/news/trunk/news/block/list.rhtml

@@ -14 +14 @@
-    <% end %>
-  </dl>
-
+, :block => true
-<% end %>

components/news/trunk/news/common_helper.rb

@@ -1 +1 @@
-module News::CommonHelper
-administrator
-administrator
+news_admin
+news_admin
-  end
-
@@ -48 +48 @@
-  end
-
-(news)
-(news)
+
+
-  end
-
@@ -123 +123 @@
-
-  def tiny_mce_mode
-RubricksLib.permitted_current_component_function?('admin')
+News::NewsLib.news_admin?
-      return 'attachment'
-    else

components/news/trunk/news/languages/chinese.rb

@@ -5 +5 @@
-      '_News_Admin_MessageUpdate'                               => '新闻讟眮修改完毕。',
-      '_News_Category_ErrorCreate'                              => '分类创建倱莥。',
-####
+䞍胜再创建分类。
-      '_News_Category_ErrorDelete'                              => 'åˆ†ç±»åˆ é™€å€±èŽ¥ã€‚',
-####
+äžèƒœåˆ é™€åˆå§‹åˆ†ç±»ã€‚
-      '_News_Category_ErrorUpdate'                              => '分类修改倱莥。',
-      '_News_Category_MessageCreate'                            => '分类创建完毕。',
-      '_News_Category_MessageDelete'                            => 'åˆ†ç±»åˆ é™€å®Œæ¯•ã€‚',
-####
-####
+åŠ‚æžœåˆ é™€æ­€åˆ†ç±»ïŒŒå±žäºŽæ­€åˆ†ç±»çš„æ–°é—»å°†åœ’å±žäºŽåˆå§‹åˆ†ç±»ã€‚ç¡®å®žèŠåˆ é™€å—ïŒŸ
+未选择分类。
-      '_News_Category_MessageUpdate'                            => '分类修改完毕。',
-      '_News_Common_Category'                                   => '分类',
@@ -58 +58 @@
-      '_News_News_ErrorPost'                                    => '新闻发衚倱莥。',
-      '_News_News_ErrorReturnInvalidUser'                       => 'æŠ•çš¿ç”šæˆ·äžºæ— æ•ˆç”šæˆ·ïŒŒæ‰€ä»¥äžèƒœé€€å›žã€‚åŠ‚æžœæ–‡ç« éœ€èŠä¿®æ­£ïŒŒè¯·è¿›è¡ŒçŒ–èŸ‘ã€‚',
-####
+新闻改䞺未读状态时发生错误。
-      '_News_News_ErrorUpdate'                                  => '新闻修改倱莥。',
-      '_News_News_MessageConfirmUnread'                         => '确实芁改䞺未读状态吗',
-?
+
-      '_News_News_MessageDelete'                                => 'æ–°é—»åˆ é™€å®Œæ¯•ã€‚',
-      '_News_News_MessageNewsNotSelected'                       => '请选择新闻。',
@@ -73 +73 @@
-¬åŒ€å‘垃。',
-      '_News_News_MessageReturnComment'                         => '可以蟓å
-
+。
-      '_News_News_MessageReturned'                              => '劂果想再次申请批准请[重新发衚]。',
-      '_News_News_MessageThereAreReturnedNews'                  => '有%s条被退回的新闻。请进行猖蟑后重新发衚。',
@@ -82 +82 @@
-      '_News_News_MessageUnableToReturnInvalidUser'             => 'æŠ•çš¿ç”šæˆ·äžºæ— æ•ˆç”šæˆ·ïŒŒæ‰€ä»¥äžèƒœé€€å›žã€‚',
-      '_News_News_MessageUnableToReturnGuestUser'               => '投皿甚户䞺匿名甚户所以䞍胜退回。',
-####
+新闻已改䞺未读状态。
-      '_News_News_MessageUpdate'                                => '新闻修改完毕。',
-    })

components/news/trunk/news/news/_item_return_confirm_window.rhtml

@@ -4 +4 @@
-    <p><%= hl('[_News_News_MessageReturnComment]') %></p>
-    <%= validate 'news_item_return_comment', [{:length => '0..80'}] %>
-_return', '
-p id="news_item_return_comment_msg"></p
+', 'return_
+div id="news_item_return_comment_msg" class="validate_msg"></div
-    <div class="rubricks_layout_buttons">
-rubricks.news.news_item_return_comment_window.close();
+
-      <input type="button" id="news_return_cancel_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_No]') %>"  onclick="rubricks.news.news_item_return_comment_window.close();" />
-      <%= rollover_swap('news_return_submit_button', 'news_return_cancel_button') %>

components/news/trunk/news/news/_main_news_create_window.rhtml

@@ -4 +4 @@
-      <% validate_form('news_create_button') do %>
-        <table class="rubricks_general_table">
+          <tr class="table_dummy">
+            <td style="width:20%;"></td>
+            <td style="width:80%;"></td>
+          </tr>
-          <tr class="rubricks_general_table_even">
-%= validate 'post_news_title', [{:required => true}, {:length => '1..64'}] %
- class="text_bold" style="width:20%;"><%= hl('[_Common_Title]') %></td
-<td style="width:80%;"
+td><span class="text_bold"><%= hl('[_Common_Title]') %></span></td
+
+  <%= validate 'post_news_title', [{:required => true}, {:length => '1..64'}] %
-              <%= text_field 'post_news', 'title', :size => 32, :class => 'input_text_inactive focus' %>
-              <span id="post_news_title_msg"></span>
@@ -13 +17 @@
-          </tr>
-          <tr class="rubricks_general_table_even">
- class="text_bold" style="width:20%;"><%= hl('[_Common_Category]') %
- style="width:80%;"
+><span class="text_bold"><%= hl('[_News_Common_Category]') %></span
+
-              <%= select_tag('post_news[category_id]', options_for_select(@select_options , @selected_category))%>
-            </td>
-          </tr>
-          <tr class="rubricks_general_table_even" <%= (RubricksLib.guest?) ? '' : 'style="display:none;"' %> >
-
-
+
-            <td>
+              <%= validate 'post_news_display_name', [{:required => true}, {:length => '1..32'}] %>
-              <%= text_field 'post_news', 'display_name', :size => 32, :value => default_display_name, :class => 'input_text_inactive focus' %>
-              <span id="post_news_display_name_msg"></span>
@@ -27 +31 @@
-          </tr>
-          <tr class="rubricks_general_table_even">
-
-
+
+
+
+
-              <%= text_area 'post_news', 'article', :class => "rubricks_general_window", :style => "width:100%; height:300px;" %>
-            </td>

components/news/trunk/news/news/_news_content.rhtml

@@ -1 @@
- <%= (msie?) ? 'style="table-layout:fixed;"' : '' %>
+
-  <tbody>
-style="height:0px;
+class="table_dummy
-      <td style="width:15%;"></td>
-      <td style="width:35%;"></td>
@@ -29 +29 @@
-    </tr>
-    <tr class="rubricks_general_table_even">
-style="font-weight: bold;" colspan="4"><%= hl("[_News_Common_Article]") %
+colspan="4"><span class="text_bold"><%= hl("[_News_Common_Article]") %></span
-    </tr>
-    <tr class="rubricks_general_table_even">

components/news/trunk/news/news/show_news.rhtml

@@ -13 +13 @@
-              </div>
-            <% end %>
-has_approval?(@news)
+@news.approvable?
-              <%= form_tag({:controller => '/'}, {:id => 'news_return_form', :class => 'float_button_right_inactive swap'}) %>
-                <% if @user_effectiv_is_true == true %>
@@ -33 +33 @@
-            <div class="pointcolor_text news_additional_commont">
-              <p><%= hl('[_News_News_MessageReturned]') %></p>
-
-
+return_
+return_
-              <% end %>
-            </div>
@@ -68 +68 @@
-                <% end %>
-                <table class="rubricks_general_table">
+                  <tr class="table_dummy">
+                    <td style="width:15%;"></td>
+                    <td style="width:85%;"></td>
+                  </tr>
-                  <tr class="rubricks_general_table_even">
-%= validate 'news_title', [{:required => true}, {:length => '1..64'}] %
- class="text_bold" style="width:20%;"><%= hl('[_Common_Title]') %></td
-<td style="width:80%;"
+td><span class="text_bold"><%= hl('[_Common_Title]') %></span></td
+
+  <%= validate 'news_title', [{:required => true}, {:length => '1..64'}] %
-                      <%= text_field 'news', 'title', :size => 32, :class => 'input_text_inactive focus' %>
-                      <span id="news_title_msg"></span>
@@ -77 +81 @@
-                  </tr>
-                  <tr class="rubricks_general_table_even">
- class="text_bold" style="width:20%;"><%= hl('[_News_Common_Category]') %
- style="width:80%;"
+><span class="text_bold"><%= hl('[_News_Common_Category]') %></span
+
-                      <%= select_tag('news[category_id]', options_for_select(@select_options, @selected_category)) %>
-                    </td>
-                  </tr>
-                  <tr class="rubricks_general_table_even" <%= (@news.rubricks_user) ? 'style="display:none;"' : '' %>>
-
-
+
-                    <td>
+                      <%= validate 'news_display_name', [{:required => true}, {:length => '1..32'}] %>
-                      <%= text_field 'news', 'display_name', :size => 32, :class => 'input_text_inactive focus' %>
-                      <span id="news_display_name_msg"></span>
@@ -91 +95 @@
-                  </tr>
-                  <tr class="rubricks_general_table_even">
-
-
+
+
+
+
-                      <%= text_area 'news', 'article', :class => "rubricks_general_window", :style => "height:300px; width:100%;" %>
-                    </td>

components/news/trunk/news/news/update.rjs

@@ -4 +4 @@
-else
-  page << %Q|Element.update('news_list_frame', #{simple_render_component('/news/news', 'news_list', {:id => @news_item.id}).to_json});|
-
+ || News::NewsLib.has_approval?
-end
-page << %Q|rubricks.common.rubricks_feedback_msg.add("#{hl(flash[:news_message])}");|

components/news/trunk/news/news_category.rb

@@ -30 +30 @@
-
-    def select_options(with_all = false)
-RubricksLib.hl(nc.name)
+nc.name
-      options.unshift(self.default_select_option) if with_all
-      return options

components/news/trunk/news/news_controller.rb

@@ -5 +5 @@
-  contents_approval_controller('/news/news_item', :approval_item => '[_News_Common_News]', :approval_action => 'main', :after_approve_action => 'news_approval', :after_return_action => 'news_approval', :approval_componemt => 'news', :approval_function => 'approval')
-  helper :'news/common'
-  authorize :access
-  authorize :approval,  :only   => [:before_approve, :item_approve, :item_return, :after_approve, :after_return]
-  authorize :post,      :only   => [:post,:create_news_window]
-
-  def main
@@ -14 +11 @@
-      unless waiting_count == 0
-        @waiting_news_is_existent_true = true
-permitted_current_component_function?('approval')
-RubricksLib.hl('[_News_News_MessageThereAreWaitingApprovalNews]', waiting_count)
-
-RubricksLib.hl('[_News_News_MessageThereAreWaitingNews]', waiting_count)
+News::NewsLib.has_approval?
+['[_News_News_MessageThereAreWaitingApprovalNews]', waiting_count]
+
+['[_News_News_MessageThereAreWaitingNews]', waiting_count]
-        end
-      end
@@ -23 +20 @@
-      unless returned_count == 0
-        @returned_news_is_existent_true = true
-RubricksLib.hl('[_News_News_MessageThereAreReturnedNews]', returned_count)
+['[_News_News_MessageThereAreReturnedNews]', returned_count]
-      end
-    end
@@ -32 +29 @@
-  end
-
-  def after_approve(item)
-    add_news_message(RubricksLib.hl('[_Common_Approval_Success]', RubricksLib.hl('[_News_Common_News]')))
-  end
-
-  def after_return(item)
-    item.update_attribute(:comment, params[:comment])
-    add_news_message(RubricksLib.hl('[_Common_Approval_Return_Success]', RubricksLib.hl('[_News_Common_News]')))
-  end
-
-  def before_approve(item)
-    item.publish_date = DateTime.now.strftime("%Y-%m-%d %H:%M:%S")
-  end
-
-  def before_return(item)
-    news_user = RubricksUser.find_by_id(item.rubricks_user_id)
-    raise RubricksError::Common::AjaxError, '[_News_News_ErrorReturnInvalidUser]' unless news_user.effective
-  end
-
-  def delete
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-          add_news_message('[_News_News_MessageDelete]')
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/news/news/update.rjs'
-  end
-
-  def file_accessable?(ra)
-    return true if News::NewsLib.administrator?
-    ral = ra.rubricks_attachment_links
-    if ral.empty?
-      return News::NewsLib.has_post?
-    end
-    news = News::NewsItem.find(ral.first.rubricks_attachable_id)
-    return false unless news
-    return news.accessable?
-  end
-
-  def news_approval
+    check_permission(:approve)
-  end
-
@@ -113 +67 @@
-
-  def post
-
-nc = News::NewsConfig.instance
-ru = current_user
-@news_item = News::NewsItem.new
-@news_item.title = params[:post_news][:title]
-@news_item.display_name = params[:post_news][:display_nam
-@news_item.article = params[:post_news][:articl
-@news_item.rubricks_user_id = ru.id unless ru.id == RubricksUser::GUEST_USER_ID
-@news_item.approval = Acts::Approval::WAITING
-@news_item.news_category_id
-if @news_item.is_waiting? && (!nc.approval || permitted_current_component_function?('approval') && @news_item.my_news?)
-@news_item.approval
-@news_item.publish_date
-end
-count = News::NewsCategory.count(:conditions =>['id = ?', params[:post_news][:category_id]])
-if count == 0
-raise ActiveRecord::RecordNotFound
-else
-if @news_item.save
+(:post)
+begin
+  ActiveRecord::Base.transaction do
+    ru = current_user
+    @news_item = News::NewsItem.new
+    @news_item.title              = params[:post_news][:titl
+    @news_item.display_name       = params[:post_news][:display_nam
+    @news_item.article            = params[:post_news][:article]
+    @news_item.rubricks_user_id   = ru.id unless ru.id == RubricksUser::GUEST_USER_ID
+    @news_item.news_category_id  
+    if News::NewsLib.has_approval? || !News::NewsConfig.instance.approval
+    @news_item.approval        
+    @news_item.publish_date    
+    else
+      @news_item.approval         = Acts::Approval::WAITING
+    end
+  count = News::NewsCategory.count(:conditions =>['id = ?', params[:post_news][:category_id]])
+    raise ActiveRecord::RecordNotFound if count == 0
+  @news_item.save!
-        if @news_item.is_approvaled?
-          add_news_message('[_News_News_MessagePostToPublic]')
@@ -137 +91 @@
-          add_news_message('[_News_News_MessagePostToWaiting]')
-        end
-      else
-        add_news_message('[_News_News_ErrorPost]')
-      end
-      headers["Content-Type"] = "text/javascript"
-      render :template => '/news/news/update.rjs'
+    rescue Exception => ex
+      log_rubricks_error(ex, '[_News_News_ErrorPost]')
-    end
-  end
@@ -164 +118 @@
-    begin
-      ActiveRecord::Base.transaction do
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    headers["Content-Type"] = "text/javascript"
-    render :template => '/news/news/return_unread_state.rjs'
@@ -182 +134 @@
-    if news_id
-      @news = News::NewsItem.find(news_id) rescue return
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-      if @news.is_approvaled?
-
-
-
-
+            
+                 
+          
+   
-      elsif @news.is_waiting?
-
-
-
-
+            
+                 
+          
+   
-      elsif @news.is_returned?
-
-
-
-
+            
+                 
+          
+   
-      end
-      @news.read
@@ -221 +161 @@
-
-  def update
-
-
-
-
-
-
-
-
-
-
-
-