Revision 442:753f1380d6bc lib/.svn/text-base

View differences:

lib/.svn/text-base/redcloth3.rb.svn-base
296 296
        rip_offtags text
297 297
        no_textile text
298 298
        escape_html_tags text
299
        # need to do this before #hard_break and #blocks
300
        block_textile_quotes text unless @lite_mode
299 301
        hard_break text 
300 302
        unless @lite_mode
301 303
            refs text
302
            # need to do this before text is split by #blocks
303
            block_textile_quotes text
304 304
            blocks text
305 305
        end
306 306
        inline text
......
707 707
            atts = pba( atts )
708 708

  
709 709
            # pass to prefix handler
710
            replacement = nil
710 711
            if respond_to? "textile_#{ tag }", true
711
                text.gsub!( $&, method( "textile_#{ tag }" ).call( tag, atts, cite, content ) )
712
              replacement = method( "textile_#{ tag }" ).call( tag, atts, cite, content )
712 713
            elsif respond_to? "textile_#{ tagpre }_", true
713
                text.gsub!( $&, method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content ) )
714
              replacement = method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content )  
714 715
            end
716
            text.gsub!( $& ) { replacement } if replacement
715 717
        end
716 718
    end
717 719
    
lib/.svn/text-base/redmine.rb.svn-base
41 41
  fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
42 42
  fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
43 43
  fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
44
  fields.register Redmine::CustomFieldFormat.new('user', :label => :label_user, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 8)
45
  fields.register Redmine::CustomFieldFormat.new('version', :label => :label_version, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 9)
44 46
end
45 47

  
46 48
# Permissions
......
69 71
    map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
70 72
    map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
71 73
    map.permission :manage_subtasks, {}
74
    map.permission :set_issues_private, {}
75
    map.permission :set_own_issues_private, {}, :require => :loggedin
72 76
    map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
73 77
    map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
74 78
    map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
......
84 88
  end
85 89
  
86 90
  map.project_module :time_tracking do |map|
87
    map.permission :log_time, {:timelog => [:new, :create, :edit, :update]}, :require => :loggedin
91
    map.permission :log_time, {:timelog => [:new, :create, :edit, :update, :bulk_edit, :bulk_update]}, :require => :loggedin
88 92
    map.permission :view_time_entries, :timelog => [:index, :show], :time_entry_reports => [:report]
89
    map.permission :edit_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :member
90
    map.permission :edit_own_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin
93
    map.permission :edit_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member
94
    map.permission :edit_own_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
91 95
    map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
92 96
  end
93 97
  

Also available in: Unified diff