Merge branch 'various_bugs' into nccu_master

Conflicts: Gemfile.lock app/assets/javascripts/ajax_form.js.erb app/assets/stylesheets/style.css.erb app/controllers/application_controller.rb app/controllers/sessions_controller.rb app/helpers/admin/web_link_helper.rb app/views/admin/attributes/_attribute_field.html.erb app/views/admin/designs/_form.html.erb app/views/admin/pages/_form.html.erb app/views/admin/sites/_side_bar.html.erb app/views/layouts/_orbit_bar.html.erb app/views/layouts/_side_bar.html.erb config/locales/en.yml config/locales/zh_tw.yml config/mongoid.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
commit 65ac6980c4
@@ -1,14 +1,17 @@
 class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
  include OrbitControllerLib::DivisionForDisable
-  before_filter :authenticate_user!
  # before_filter :for_app_manager,:except => [:index,:show] 
+
+  before_filter :force_order_for_visitor,:only=>[:index]
+  before_filter :force_order_for_user,:except => [:index]
+
  before_filter :for_app_sub_manager,:except => [:index]
  before_filter :only => [ :new,:edit,:update,:create] do |controller|
    controller.get_categorys('WebLinkCategory')
  end

  def index
-  
+
  get_categorys("WebLinkCategory",params[:web_link_category_id])
  @filter = params[:filter]
  new_filter = params[:new_filter]
@@ -1,6 +1,6 @@
 <tr id="<%= dom_id web_link %>" class="with_action">
 	<td>
-		<% if (web_link.create_user_id ==  current_user.id) || is_manager? %>
+		<% if (web_link.create_user_id ==  current_or_guest_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', web_link.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
@@ -15,7 +15,7 @@
 </table>

 <div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' %>
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_panel_web_resource_back_end_web_link_path, :class => 'btn btn-primary pull-right' if (is_manager? rescue nil) %>
 	<div id="web_link_pagination" class="paginationFixed">
 	<%= paginate @web_links, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
 	</div>
@@ -6,7 +6,7 @@
  "intro": "A simple blog……",
  "update_info": "Some info",
  "create_date": "11-11-2011",
-	"widgets": ["home_list"].
+	"widgets": ["home_list"],
 	"category": ["WebLinkCategory"],
 	"enable_frontend": true
 }