Merge branch 'master' of github.com:Rulingcom/NCCU

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -291,8 +291,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      bulletins = Bulletin.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      bulletins = Bulletin.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

@@ -1,4 +1,5 @@
-<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'bulletin.status'],
+<%= render_sort_bar(true, delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
+	 ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'bulletin.status'],
 													['category', 'bulletin_category', 'span1-2', 'bulletin.category'],
 													['title', 'title','span7', 'bulletin.title'],
 													['start_date', 'postdate', 'span1-2', 'bulletin.start_date'],

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb

@@ -1,9 +1,7 @@
-<%= form_for :bulletins, :url => delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
-	<%= render 'filter' %>
-	<table id="bulettin_sort_list" class="table main-list">
-		<%= render 'bulletins' %>
-	</table>
-<% end %>
+<%= render 'filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'bulletins' %>
+</table>
 
 <div class="form-actions form-fixed pagination-right">
 	<%= 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 pull-right' %>

vendor/built_in_modules/announcement/config/routes.rb

@@ -15,7 +15,7 @@ Rails.application.routes.draw do
             get 'load_quick_edit'
           end
           collection do
-            post 'delete'
+            get 'delete'
           end
           match "file_quick_add/:bulletin_id" => "bulletins#file_quick_add" ,:as => :file_quick_add
           match "file_quick_edit/:bulletin_id" => "bulletins#file_quick_edit" ,:as => :file_quick_edit

vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb

@@ -328,8 +328,8 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      news_bulletins = NewsBulletin.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      news_bulletins = NewsBulletin.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to panel_news_back_end_news_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_sort_headers.html.erb

@@ -1,4 +1,5 @@
-<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'news_bulletin.status'],
+<%= render_sort_bar(true, delete_panel_news_back_end_news_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
+	['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', 'news_bulletin.status'],
 													['category', 'news_bulletin_category', 'span1-2', 'news_bulletin.category'],
 													['title', 'title','span7', 'news_bulletin.title'],
 													['start_date', 'postdate', 'span1-2', 'news_bulletin.start_date'],

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb

@@ -1,9 +1,7 @@
-<%= form_for :news_bulletins, :url => delete_panel_news_back_end_news_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
-	<%= render 'filter' %>
-	<table id="bulettin_sort_list" class="table main-list">
-		<%= render 'news_bulletins' %>
-	</table>
-<% end %>
+<%= render 'filter' %>
+<table id="bulettin_sort_list" class="table main-list">
+	<%= render 'news_bulletins' %>
+</table>
 
 <div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_panel_news_back_end_news_bulletin_path, :class => 'btn btn-primary' %>

vendor/built_in_modules/news/config/routes.rb

@@ -15,7 +15,7 @@ Rails.application.routes.draw do
             get 'load_quick_edit'
           end
           collection do
-            post 'delete'
+            get 'delete'
           end
           match "file_quick_add/:news_bulletin_id" => "news_bulletins#file_quick_add" ,:as => :file_quick_add
           match "file_quick_edit/:news_bulletin_id" => "news_bulletins#file_quick_edit" ,:as => :file_quick_edit

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_sort_headers.html.erb

@@ -1,4 +1,4 @@
-<%= render_sort_bar(false, ['name', 'page','span7', 'page_context.name'],
+<%= render_sort_bar(false, nil, ['name', 'page','span7', 'page_context.name'],
 													['version', 'version', 'span2', 'page_context.version'],
 													['update_time', 'updated_at', 'span2', 'page_context.update_time'],
 													['last_modified', 'update_user_id', 'span2', 'page_context.last_modified']).html_safe %>

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

@@ -124,8 +124,8 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
   end
 
   def delete
-    if params[:to_delete]
-      web_links = WebLink.any_in(:_id => params[:to_delete]).delete_all
+    if params[:ids]
+      web_links = WebLink.any_in(:_id => params[:ids]).delete_all
     end
     redirect_to panel_web_resource_back_end_web_links_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb

@@ -1,4 +1,5 @@
-<%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'],
+<%= render_sort_bar(true, delete_panel_web_resource_back_end_web_links_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
+	['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'],
 													['category', 'bulletin_category', 'span2', 'bulletin.category'],
 													['title', 'title','span3', 'bulletin.title'],
 													['tags', 'tags', 'span2', 'bulletin.tags']).html_safe %>

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

@@ -1,20 +1,18 @@
-<%= form_for :news_bulletins, :url => delete_panel_web_resource_back_end_web_links_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
-	<%= render 'filter' %>
-	<table class="table main-list">
-		<thead>
-			<tr>
-				<th class="span1"></th>
-				<th class="span1"></th>
-				<th class="span2"></th>
-				<th class="span3"></th>
-				<th class="span2"></th>
-			</tr>
-		</thead>
-		<tbody id="tbody_web_links" class="sort-holder">
-			<%= render :partial => 'web_link', :collection => @web_links %>
-		</tbody>
-	</table>
-<% end %>
+<%= render 'filter' %>
+<table class="table main-list">
+	<thead>
+		<tr>
+			<th class="span1"></th>
+			<th class="span1"></th>
+			<th class="span2"></th>
+			<th class="span3"></th>
+			<th class="span2"></th>
+		</tr>
+	</thead>
+	<tbody id="tbody_web_links" class="sort-holder">
+		<%= render :partial => 'web_link', :collection => @web_links %>
+	</tbody>
+</table>
 
 <div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %>

vendor/built_in_modules/web_resource/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
         root :to => "web_links#index"
         resources :web_links do
           collection do
-            post 'delete'
+            get 'delete'
           end
         end
 		resources :web_link_categorys