Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

app/controllers/admin/dashboards_controller.rb

@@ -5,6 +5,35 @@ class Admin::DashboardsController < ApplicationController
 #  before_filter :is_admin?
   
   def index
+  	@module_app_contents, @module_app_contents_total = get_module_app_count('bulletin', 'news_bulletin', 'page_context', 'web_link')
+  	@recent_updated = get_recently_updated('bulletin', 'news_bulletin', 'page_context', 'web_link')
+  end
+
+  protected
+
+  def get_module_app_count(*args)
+  	a = {}
+  	total = 0
+  	args.each do |module_app|
+  		module_app_class = module_app.classify.constantize
+  		count = module_app_class.count
+  		a.merge!(module_app => count)
+  		total += count
+  	end
+  	[a.sort {|a,b| b[1]<=>a[1]}, total]
+  end
+
+  def get_recently_updated(*args)
+  	a = {}
+  	args.each do |module_app|
+  		module_app_class = module_app.classify.constantize
+  		objects = module_app_class.order_by(:updated_at, :desc).limit(10)
+  		objects.each do |object|
+  			a.merge!(object => object.updated_at)
+  		end
+  	end
+  	sorted_objects = a.sort {|a,b| b[1]<=>a[1]}
+  	sorted_objects[0..9]
   end
   
 end

app/controllers/admin/page_parts_controller.rb

@@ -43,8 +43,8 @@ class Admin::PagePartsController < ApplicationController
   def update
     @part = PagePart.find(params[:id])
     if @part.update_attributes(params[:page_part])
+      set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
       flash.now[:notice] = t('admin.update_success_content')
-      @part.save
       respond_to do |format|
         format.html { 
           redirect_to admin_page_url( @part.page )
@@ -89,5 +89,14 @@ class Admin::PagePartsController < ApplicationController
       format.js  {}
     end
   end
+
+  protected
+
+  def set_children_sub_menu(part)
+    part.page.children.each do |child|
+      child_part = child.page_parts.detect{ |x| x.name.eql?(part.name) } rescue nil
+      child_part.update_attributes(:kind => part.kind, :public_r_tag => part.public_r_tag, :public_r_tag_object_id => part.public_r_tag_object_id) rescue nil
+    end
+  end
   
 end