Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Conflicts:
	config/environments/development.rb

lib/orbit_core_lib.rb

@@ -31,4 +31,44 @@ module  OrbitCoreLib
     end
     
   end
+  module  ObjectTokenUnility
+    def self.included(base)
+      base.instance_eval("field :s_token")
+      base.instance_eval("after_create :generate_token")
+    end
+    
+    def token
+      return self.s_token
+    end
+    
+    protected
+     def generate_token
+       self.s_token = ActiveSupport::SecureRandom.hex(16)
+       self.save!
+     end
+  end
+  
+  module PermissionUnility
+  private
+    def check_permission(type = :use)
+      permission_grant =  current_user.admin?? true : false
+      module_app = @module_app.nil?? find_module_app_by_token(params[:token]) : @module_app
+      unless permission_grant
+        permission_grant = case type
+        when :use
+          users_ary = module_app.app_auth.auth_users rescue nil
+          users_ary = [] if users_ary.nil?
+          (users_ary.include?(current_user) || module_app.is_manager?(current_user) || module_app.is_sub_manager?(current_user))
+        when :manager
+          module_app.is_manager?(current_user)
+        when :sub_manager  
+          module_app.is_manager?(current_user) || module_app.is_sub_manager?(current_user)
+        end  
+      end
+      permission_grant
+    end
+    def find_module_app_by_token(token)
+      ModuleApp.first(conditions: {s_token: token})
+    end
+  end
 end

lib/parsers/parser_front_end.rb

@@ -81,7 +81,7 @@ module ParserFrontEnd
         res << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>"
         res << "<script type='text/javascript' src='/assets/event.js'></script>"
         page.design.javascripts.each do |js|
-          res << "<script type='text/javascript' src='#{js.file.url}'></script>"
+          # res << "<script type='text/javascript' src='#{js.file.url}'></script>"
         end
         res
       end

lib/tasks/anc_tasks.rake

@@ -0,0 +1,22 @@
+# encoding: utf-8 
+
+namespace :anc do
+  
+  task :build => :environment do
+    bulletin_category_1 = BulletinCategory.create(:key => "C1ChrisCheckANDPreivew",:display => "List" )
+    bulletin_category_1.create_i18n_variable(:en => "ChrisCheckANDPreivew", :zh_tw => 'ChrisCheckANDPreivew')
+    bulletin_category_2 = BulletinCategory.create(:key => "C2MattCheckANDPreivew",:display => "List"  )
+    bulletin_category_2.create_i18n_variable(:en => "MattCheckANDPreivew", :zh_tw => 'MattCheckANDPreivew')
+    bulletin_category_3 = BulletinCategory.create(:key => "C3MattCheckChrisPreview",:display => "List"  )
+    bulletin_category_3.create_i18n_variable(:en => "MattCheckChrisPreview", :zh_tw => 'MattCheckChrisPreview')
+    
+  
+    bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_1  )
+    bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_1  )
+    bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_2  )
+    bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_2  )
+    bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_3  )
+    bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category =>   bulletin_category_3  )
+  
+  end
+end

lib/tasks/dev.rake

@@ -125,6 +125,12 @@ namespace :dev do
     AttributeValue.create( :user_id => user.id, :attribute_field_id => i_1.attribute_fields[1].id, :key => 'last_name', :en => 'Fu', :zh_tw => '傅' )
     AttributeValue.create( :user_id => user.id, :attribute_field_id => sr_2_1.attribute_fields[0].id, :key => 'major', :en => 'Information management', :zh_tw => '信息化管理' )
     AttributeValue.create( :user_id => user.id, :attribute_field_id => sr_2_1.attribute_fields[1].id, :key => 'department', :en => 'Computer Science', :zh_tw => '計算機科學' )
+
+    user = User.create( :email => 'manager@rulingcom.com', :password => 'password', :password_confirmation => 'password', :admin => false, :role_id => r_2.id, :sub_role_ids => [sr_2_1.id ] )
+    AttributeValue.create( :user_id => user.id, :attribute_field_id => i_1.attribute_fields[0].id, :key => 'first_name', :en => 'Manager', :zh_tw => '管理員' )
+    AttributeValue.create( :user_id => user.id, :attribute_field_id => i_1.attribute_fields[1].id, :key => 'last_name', :en => 'Chen', :zh_tw => '陳' )
+    AttributeValue.create( :user_id => user.id, :attribute_field_id => sr_2_1.attribute_fields[0].id, :key => 'major', :en => 'Information management', :zh_tw => '信息化管理' )
+    AttributeValue.create( :user_id => user.id, :attribute_field_id => sr_2_1.attribute_fields[1].id, :key => 'department', :en => 'Computer Science', :zh_tw => '計算機科學' )
     
     
     ad_banner = AdBanner.new(:title => 'banner_1',:post_date => Date.today,:context=> "context",:ad_fx=>'zoom',:direct_to_after_click=>true)

lib/tasks/user.rake

@@ -5,7 +5,7 @@ namespace :user do
     User.all(conditions: {email: /nor/}).destroy_all
     
     username_list = %w{nor1 nor2 nor3 nor4 nor5 nor6 nor7}
-    userfirstname_list_en = %w{ One Two Thre For Fiv Six Sen }
+    userfirstname_list_en = %w{ UserOne UserTwo Thre For Fiv Six Sen }
     userlastname_list_en = %w{ Aa Bb Cc Dd Ee Ff Gg }
     
     userfirstname_list_ct = %w{  一一 二二 三三 四四 五五 六六 七七 }