Changeset 5789

Show
Ignore:
Timestamp:
06/12/08 08:38:51 (3 months ago)
Author:
uta
Message:

2008/06/12 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • rubricks_core/trunk/app/models/rubricks_component.rb

    r5688 r5789  
    136136      end 
    137137 
    138       component_blocks = ci.blocks || [] 
     138      component_blocks, permit_individual_block = ci.blocks 
    139139      component_blocks.each do |component_block| 
    140140        rcf = RubricksComponentFunction.find(:first, :conditions => ['rubricks_component_id = ? and name = ?', rc.id, component_block[:function]]) 
    …… 
    383383          end 
    384384 
    385           component_blocks = ci.blocks || [] 
    386           unless rcf_id_list.empty? 
    387             rb_list = RubricksBlock.find(:all, :conditions => ["rubricks_component_function_id in (#{rcf_id_list})"]) 
    388             rb_list.each do |rb| 
    389               rb.destroy if component_blocks.detect {|component_block| component_block[:controller].sub(%r(^/?), '/') == rb.controller && component_block[:action] == rb.action && component_block[:function] == rb.rubricks_component_function.name}.nil? 
     385          component_blocks, permit_individual_block = ci.blocks 
     386          unless permit_individual_block 
     387            unless rcf_id_list.empty? 
     388              rb_list = RubricksBlock.find(:all, :conditions => ["rubricks_component_function_id in (#{rcf_id_list})"]) 
     389              rb_list.each do |rb| 
     390                rb.destroy if component_blocks.detect {|component_block| component_block[:controller].sub(%r(^/?), '/') == rb.controller && component_block[:action] == rb.action && component_block[:function] == rb.rubricks_component_function.name}.nil? 
     391              end 
    390392            end 
    391393          end 

  • rubricks_core/trunk/app/models/rubricks_component_info.rb

    r5574 r5789  
    22  attr_accessor :name 
    33  attr_reader   :author 
    4   attr_reader   :blocks 
    54  attr_reader   :description 
    65  attr_reader   :display_name 
    …… 
    2827      return ci 
    2928    end 
     29  end 
     30 
     31  def blocks 
     32    @blocks ||= [] 
     33    blocks = @blocks.dup 
     34    if blocks.first == :permit_individual_menu 
     35      blocks.shift 
     36      permit_individual_block = true 
     37    else 
     38      permit_individual_block = false 
     39    end 
     40    return blocks, permit_individual_block 
    3041  end 
    3142 
    …… 
    105116    if self.blocks 
    106117      block_uri_list = [] 
    107       self.blocks.each do |block| 
     118      blocks, permit_individual_block = self.blocks 
     119      blocks.each do |block| 
    108120        raise sprintf(RubricksMessage::MESSAGE_E0001, 'RubricksComponentFunction of block is not set.') if block[:function].blank? 
    109121        raise sprintf(RubricksMessage::MESSAGE_E0001, "#{block[:function]} is not define as RubricksComponentFunction.") unless valid_function?(block[:function]) 

  • rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_pagination_helper.rb

    r5781 r5789  
    2929        end 
    3030        if arguments[:with_div_frame] 
    31           result.unshift(%Q|<div id="#{prefix}frame" class="#{(arguments[:block].blank?) ? 'text_center' : 'block_paginate'} print_display_none" style="padding:1px;">|) 
     31          result.unshift(%Q|<div id="#{prefix}frame" class="text_center print_display_none" style="padding:1px;">|) 
    3232          result.push('</div>') 
    3333        end 
    …… 
    6262        end 
    6363        if arguments[:with_div_frame] 
    64           result.unshift(%Q|<div id="#{prefix}frame" class="#{(arguments[:block].blank?) ? 'text_center' : 'block_paginate'} print_display_none" style="padding:1px;">|) 
     64          result.unshift(%Q|<div id="#{prefix}frame" class="text_center print_display_none" style="padding:1px;">|) 
    6565          result.push('</div>') 
    6666        end 
    …… 
    7171      def fix_arguments(arguments) 
    7272        arguments = { 
    73           :block                => false, 
    7473          :function             => '', 
    7574          :html_options         => {}, 

  • rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_spinelz_helper.rb

    r5781 r5789  
    1414      end 
    1515 
     16      def firefox? 
     17        /Firefox/ === request.env['HTTP_USER_AGENT'] 
     18      end 
     19 
     20      def firefox3? 
     21        %r|Firefox/3| === request.env['HTTP_USER_AGENT'] 
     22      end 
     23 
    1624      def msie? 
    1725        /MSIE/ === request.env['HTTP_USER_AGENT'] 
    …… 
    2634      end 
    2735 
    28       def firefox? 
    29         /Firefox/ === request.env['HTTP_USER_AGENT'] 
     36      def safari? 
     37        /Safari/ === request.env['HTTP_USER_AGENT'] 
    3038      end 
    3139 
    32       def firefox3? 
    33         /Firefox\/3/ === request.env['HTTP_USER_AGENT'] 
     40      def safari3? 
     41        safari? && %r|Version/3| === request.env['HTTP_USER_AGENT'] 
    3442      end 
    3543    end