Changeset 455

Show
Ignore:
Timestamp:
01/22/07 19:35:45 (2 years ago)
Author:
timo
Message:
  • Replaced the rest of Report occurrances with Form.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/workorder_report_rename/app/controllers/application.rb

    r355 r455  
    8484  protected_page_group :asset_change_type, 'asset', ['change_type'], 'change_type_protector' 
    8585  protected_page_group :work_order_edit, 'work_order', ['edit'], 'edit_protector' 
    86   protected_page_group :report_edit, 'report', ['edit'], 'edit_protector' 
    87   protected_page_group :report_type_wizard, 'report_type', [  'create_step1', 
     86  protected_page_group :form_edit, 'form', ['edit'], 'edit_protector' 
     87  protected_page_group :form_type_wizard, 'form_type', [  'create_step1', 
    8888                                                              'create_step2', 
    8989                                                              'create_step3', 
    …… 
    9191                                                              'create_step5', 
    9292                                                              'preview', 
    93                                                               'update_report_fields', 
    94                                                               'update_report_field_groups', 
    95                                                               'add_report_field_group', 
     93                                                              'update_form_fields', 
     94                                                              'update_form_field_groups', 
     95                                                              'add_form_field_group', 
    9696                                                              'add_enumerated_value', 
    9797                                                              'remove_enumerated_value'], 'wizard_protector' 
    …… 
    299299  def translate_urls_to_markup_links(text) 
    300300    # Matches for the base of the url 
    301     report_url_match = url_for(:controller => 'report', :action => 'view') 
     301    form_url_match = url_for(:controller => 'form', :action => 'view') 
    302302    work_order_url_match = url_for(:controller => 'work_order', :action => 'view') 
    303303    attachment_url_match = url_for(:controller => 'attachment', :action => 'view') 
    …… 
    308308    params_match = /([[:digit:]]+)[^[:space:]]*/ 
    309309 
    310     # Reports 
    311     output = text.gsub(/#{report_url_match}\/#{params_match}/) { |m| "[#{$~[1]}]" } 
     310    # Forms 
     311    output = text.gsub(/#{form_url_match}\/#{params_match}/) { |m| "[#{$~[1]}]" } 
    312312    # Work orders 
    313313    output = output.gsub(/#{work_order_url_match}\/#{params_match}/) { |m| "{#{$~[1]}}" } 

  • branches/workorder_report_rename/app/controllers/asset_field_controller.rb

    r378 r455  
    2828                              AssetField::DATETIME => _('Datetime') 
    2929                            } ], 
    30                [_('User field in report template'), :full_user_field_name] 
     30               [_('User field in form template'), :full_user_field_name] 
    3131              ] 
    3232    @actions = [ [_('Edit'), {:action=> 'edit', :asset_type_id => @asset_type.id, :image=>'16x16/edit'}] ] 
    …… 
    4343               [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ], 
    4444               [_('Type')], 
    45                [_('User field in report template'), :text_field_with_prefix, 'user_field_name', { :size => 17, :maxlength => 17, :prefix => 'cmms_asset_' } ] 
     45               [_('User field in form template'), :text_field_with_prefix, 'user_field_name', { :size => 17, :maxlength => 17, :prefix => 'cmms_asset_' } ] 
    4646              ] 
    4747    fields[1][1..-1] = [:select, 'type_code', [ 
    …… 
    6565               [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ], 
    6666               [_('Type')], 
    67                [_('User field in report template'), :text_field_with_prefix, 'user_field_name', { :size => 17, :maxlength => 17, :prefix => 'cmms_asset_' } ] 
     67               [_('User field in form template'), :text_field_with_prefix, 'user_field_name', { :size => 17, :maxlength => 17, :prefix => 'cmms_asset_' } ] 
    6868              ] 
    6969    fields[1][1..-1] = [:text, 'type_code_as_text'] 

  • branches/workorder_report_rename/app/controllers/asset_permission_controller.rb

    r352 r455  
    156156    all_user_groups = @asset.user_groups.find(:all, :readonly => true) 
    157157 
    158     @report_permission_profiles = @assets_user_group.report_permission_profiles.find(:all, :readonly => true) 
    159     @report_available_groups = (all_user_groups - @report_permission_profiles.map {|p| p.user_group }).map {|g| [g.name, g.id] } 
    160     @report_permission_profiles << ReportPermissionProfile.new(:other => true) if @report_permission_profiles.select { |profile| profile.other }.empty? 
     158    @form_permission_profiles = @assets_user_group.form_permission_profiles.find(:all, :readonly => true) 
     159    @form_available_groups = (all_user_groups - @form_permission_profiles.map {|p| p.user_group }).map {|g| [g.name, g.id] } 
     160    @form_permission_profiles << FormPermissionProfile.new(:other => true) if @form_permission_profiles.select { |profile| profile.other }.empty? 
    161161    @work_order_permission_profiles = @assets_user_group.work_order_permission_profiles.find(:all, :readonly => true) 
    162162    @work_order_available_groups = (all_user_groups - @work_order_permission_profiles.map {|p| p.user_group }).map {|g| [g.name, g.id] } 
    …… 
    207207    return unless authorized_to_edit_assets_permissions(asset) 
    208208 
    209     assets_user_group.update_permission_profiles(params[:profile], params[:report], params[:work_order], params[:attachment]) 
     209    assets_user_group.update_permission_profiles(params[:profile], params[:form], params[:work_order], params[:attachment]) 
    210210 
    211211    flash[:notice] = msg_changes_saved 

  • branches/workorder_report_rename/app/controllers/asset_tree_controller.rb

    r315 r455  
    110110    end 
    111111 
    112     # If user was viewing a report, a work order or an attachment 
     112    # If user was viewing a form, a work order or an attachment 
    113113    # redirect to the appropriate list page. 
    114     return redirect_to(:controller => 'report', :action=> 'list') if request.env['HTTP_REFERER'] =~ /report\/.*$/x 
     114    return redirect_to(:controller => 'form', :action=> 'list') if request.env['HTTP_REFERER'] =~ /form\/.*$/x 
    115115    return redirect_to(:controller => 'work_order', :action=> 'list') if request.env['HTTP_REFERER'] =~ /work_order\/.*$/x 
    116116    return redirect_to(:controller => 'attachment', :action=> 'list') if request.env['HTTP_REFERER'] =~ /attachment\/.*$/x 

  • branches/workorder_report_rename/app/controllers/data_permission_controller.rb

    r352 r455  
    4343    else 
    4444      case @object.class.to_s 
    45       when 'Report' 
     45      when 'Form' 
    4646        redirect_with_error_message(msg_unauthorized_operation(_('read'), _('[%d]', @object.id)), 
    47                                     :controller => 'report', :action => 'index') 
     47                                    :controller => 'form', :action => 'index') 
    4848      when 'WorkOrder' 
    4949        redirect_with_error_message(msg_unauthorized_operation(_('read'), _('{%d}', @object.id)), 
    …… 
    6767 
    6868    case params[:datatype] 
    69       when 'Attachment', 'Report', 'WorkOrder' 
     69      when 'Attachment', 'Form', 'WorkOrder' 
    7070        protector = Asset.find params[:id] 
    7171      when 'TypeAttachment' 
    …… 
    116116 
    117117  def find_object(datatype, id) 
    118     raise "Invalid datatype" unless ['Report', 'WorkOrder', 'Attachment', 'TypeAttachment'].include?(datatype) 
     118    raise "Invalid datatype" unless ['Form', 'WorkOrder', 'Attachment', 'TypeAttachment'].include?(datatype) 
    119119    @object = Object.const_get(datatype).find(id) 
    120120  end 

  • branches/workorder_report_rename/app/controllers/overview_controller.rb

    r293 r455  
    2626  def get_chart 
    2727    case params[:type] 
    28       when 'reports_by_type' 
    29         image = generate_reports_by_type_chart 
     28      when 'forms_by_type' 
     29        image = generate_forms_by_type_chart 
    3030      when 'work_orders_by_status' 
    3131        image = generate_work_orders_by_status_chart 
    …… 
    4343 
    4444protected 
    45   def generate_reports_by_type_chart 
     45  def generate_forms_by_type_chart 
    4646    find_selected_assets 
    47     report_types = ReportType.find(:all, :readonly => true) 
    48     report_counts = report_types.collect { |type| 
    49       Report.count_authorized_to(:read, [@selected_assets_condition[0] + ' AND report_type_id = ?'] + [@selected_assets_condition[1], type.id]) 
     47    form_types = FormType.find(:all, :readonly => true) 
     48    form_counts = form_types.collect { |type| 
     49      Form.count_authorized_to(:read, [@selected_assets_condition[0] + ' AND form_type_id = ?'] + [@selected_assets_condition[1], type.id]) 
    5050    } 
    5151 
    52     return pie(300, 200, report_counts, report_types.collect { |type| type.name }) 
     52    return pie(300, 200, form_counts, form_types.collect { |type| type.name }) 
    5353  end 
    5454 

  • branches/workorder_report_rename/app/controllers/search_controller.rb

    r293 r455  
    1919    search_string = params[:search_string].strip 
    2020 
    21     # Search reports "[3432]" "[43242" 
     21    # Search forms "[3432]" "[43242" 
    2222    search_string.scan(/\[([[:digit:]]+)/) { |id| 
    2323      id = id.first.to_i 
    24       unless Report.find_in_authorized_assets(:all, :conditions => ['id = ?', id], :readonly => true).empty? 
    25         redirect_to :controller => 'report', :action => 'view', :id => id 
     24      unless Form.find_in_authorized_assets(:all, :conditions => ['id = ?', id], :readonly => true).empty? 
     25        redirect_to :controller => 'form', :action => 'view', :id => id 
    2626        return 
    2727      else 
    28         flash[:notice] = _('Report [%i] not found', id) 
     28        flash[:notice] = _('Form [%i] not found', id) 
    2929      end 
    3030    } 

  • branches/workorder_report_rename/app/controllers/timeline_controller.rb

    r293 r455  
    4444    id_conditions = [] 
    4545 
    46     for klass in [Report, WorkOrder, Attachment] 
     46    for klass in [Form, WorkOrder, Attachment] 
    4747      ids = klass.find_authorized_to_read(:all, :select => select, :conditions => @selected_assets_condition).collect { |r| r.id } 
    4848      next if ids.empty? 

  • branches/workorder_report_rename/app/controllers/work_order_controller.rb

    r370 r455  
    214214    @title = _('Create new work order') 
    215215    @hide_subaction_links = true 
    216     @cause_report_id = params[:cause_report_id] if params[:cause_report_id] 
     216    @cause_form_id = params[:cause_form_id] if params[:cause_form_id] 
    217217    @work_order_types = params[:tag_id].nil? ? WorkOrderType.find(:all, :order => 'name') : WorkOrderTag.find(params[:tag_id]).work_order_types 
    218218 
    …… 
    231231      @work_order = WorkOrder.new params[:work_order] 
    232232      @work_order.asset = @selected_asset 
    233       @work_order.cause_report_id = @cause_report_id if @cause_report_id 
     233      @work_order.cause_form_id = @cause_form_id if @cause_form_id 
    234234      @work_order.starting_time = nil unless params[:starting_time_enabled] 
    235235      @work_order.deadline = nil unless params[:deadline_enabled] 
    …… 
    271271    end 
    272272 
    273     # Get associated reports 
    274     report_ids = work_order.associated_report_ids 
    275     if report_ids 
    276       reports = Report.find(report_ids, :readonly => true) 
     273    # Get associated forms 
     274    form_ids = work_order.associated_form_ids 
     275    if form_ids 
     276      forms = Form.find(form_ids, :readonly => true) 
    277277    end 
    278278 
    …… 
    280280    document = work_order_template.create_filled_version(work_order) 
    281281 
    282     # Send the document if there are no associated reports 
    283     if report_ids.empty? 
     282    # Send the document if there are no associated forms 
     283    if form_ids.empty? 
    284284      send_data(document.data, :filename => "work_order_#{work_order.id}.odt", :disposition => 'inline') 
    285285      return 
    …… 
    287287 
    288288    # Create sections 
    289     document.create_section_links_for_reports(report_ids) 
    290  
    291     # Generate documents for the reports 
    292     report_documents = reports.collect { |report| 
    293       [report.id, report.report_type.report_template.create_filled_version(report, true, true)] 
     289    document.create_section_links_for_forms(form_ids) 
     290 
     291    # Generate documents for the forms 
     292    form_documents = forms.collect { |form| 
     293      [form.id, form.form_type.form_template.create_filled_version(form, true, true)] 
    294294    } 
    295295 
    …… 
    304304    zout.write(document.data) 
    305305 
    306     # Write reports 
    307     for id, report_document in report_documents 
    308       zout.put_next_entry(dir_name + "report_#{id}.odt") 
    309       zout.write(report_document.data) 
     306    # Write forms 
     307    for id, form_document in form_documents 
     308      zout.put_next_entry(dir_name + "form_#{id}.odt") 
     309      zout.write(form_document.data) 
    310310    end 
    311311 

  • branches/workorder_report_rename/app/controllers/work_order_type_controller.rb

    r378 r455  
    6363    @work_order_template = WorkOrderTemplate.find(:first) 
    6464    if @work_order_template 
    65       image_base_url = url_for(:controller => 'report', :action => 'get_image', :id => @work_order_template.id) + '?filename=' 
     65      image_base_url = url_for(:controller => 'form', :action => 'get_image', :id => @work_order_template.id) + '?filename=' 
    6666      @template_style, @template_body = @work_order_template.convert_to_html(image_base_url) if @work_order_template 
    6767    end 

  • branches/workorder_report_rename/app/models/asset.rb

    r368 r455  
    2424  # Associations 
    2525  belongs_to :asset_type 
    26   has_many :reports 
     26  has_many :forms 
    2727  has_many :work_orders 
    2828  has_many :attachments 
    …… 
    104104  # ----------- 
    105105  # operation - Symbol defining which permission is checked. Possible operations 
    106   #             are :edit, :create_report, :create_work_order, :attach_file, 
     106  #             are :edit, :create_form, :create_work_order, :attach_file, 
    107107  #             :create_subasset, :edit_permissions, :remove. 
    108108  # 
    …… 
    116116      when :read 
    117117        where_sql = sanitize_sql(['user_group_id IN (?)', group_ids]) 
    118       when :edit, :create_subasset, :edit_permissions, :remove, :create_report, :create_work_order, :attach_file 
     118      when :edit, :create_subasset, :edit_permissions, :remove, :create_form, :create_work_order, :attach_file 
    119119        where_sql = sanitize_sql(["user_group_id IN (?) AND #{operation} = ?", group_ids, true]) 
    120120      else 
    …… 
    258258  end 
    259259 
    260   # Function: authorized_to_create_report? 
     260  # Function: authorized_to_create_form? 
    261261  # ====================================== 
    262262  # 
    263   # Returns true if the user is authorized to create reports to this asset 
    264   def authorized_to_create_report? 
    265     authorized_to(:create_report) 
     263  # Returns true if the user is authorized to create forms to this asset 
     264  def authorized_to_create_form? 
     265    authorized_to(:create_form) 
    266266  end 
    267267 
    …… 
    349349  def authorized_to_create?(datatype) 
    350350    case datatype.to_s 
    351       when 'Report' 
    352         return authorized_to_create_report? 
     351      when 'Form' 
     352        return authorized_to_create_form? 
    353353      when 'WorkOrder' 
    354354        return authorized_to_create_work_order? 
    …… 
    458458 
    459459    case datatype.to_s 
    460       when 'Report' 
    461         create_permission = 'create_report' 
    462         permission_profiles = :report_permission_profiles 
     460      when 'Form' 
     461        create_permission = 'create_form' 
     462        permission_profiles = :form_permission_profiles 
    463463      when 'WorkOrder' 
    464464        create_permission = 'create_work_order' 
    …… 
    567567  # ----------- 
    568568  # operation - Symbol defining which permission is checked. Possible operations 
    569   #             are :edit, :create_report, :create_work_order, :attach_file, 
     569  #             are :edit, :create_form, :create_work_order, :attach_file, 
    570570  #             :create_subasset, :edit_permissions, :remove. 
    571571  def authorized_to(operation) 
    …… 
    584584  # ----------- 
    585585  # operation - Symbol defining which permission is checked. Possible operations 
    586   #             are :edit, :create_report, :create_work_order, :attach_file, 
     586  #             are :edit, :create_form, :create_work_order, :attach_file, 
    587587  #             :create_subasset, :edit_permissions, :remove. 
    588588  def branch_authorized_to(operation) 

  • branches/workorder_report_rename/app/models/enumerated_value.rb

    r178 r455  
    11class EnumeratedValue < ActiveRecord::Base 
    22  # Protection 
    3   attr_accessible :value, :report_field_id 
     3  attr_accessible :value, :form_field_id 
    44  # Validation 
    5   validates_presence_of :value, :report_field 
    6   validates_uniqueness_of :value, :scope => 'report_field_id' 
     5  validates_presence_of :value, :form_field 
     6  validates_uniqueness_of :value, :scope => 'form_field_id' 
    77  validates_size_of :value, :maximum => 40 
    88  # Callbacks 
    99  # Associations 
    10   belongs_to :report_field 
    11   has_one :report_field_value 
     10  belongs_to :form_field 
     11  has_one :form_field_value 
    1212end 

  • branches/workorder_report_rename/app/models/open_document_file.rb

    r398 r455  
    136136 
    137137  rescue => x 
    138     _error "Failed to convert OpenDocument report." 
     138    _error "Failed to convert OpenDocument form." 
    139139    raise x 
    140140  end 

  • branches/workorder_report_rename/app/models/work_order.rb

    r407 r455  
    44class WorkOrder < ProtectedAssetData 
    55  # Protection 
    6   attr_protected :id, :asset_id, :responsible_user_id, :created_by, :created_at, :ready, :cause_report_id 
     6  attr_protected :id, :asset_id, :responsible_user_id, :created_by, :created_at, :ready, :cause_form_id 
    77  # Validation 
    88  validates_presence_of :short_description 
    …… 
    1313  belongs_to :work_order_type 
    1414  belongs_to :responsible_user, :class_name => 'User', :foreign_key => 'responsible_user_id' 
    15   belongs_to :cause_report, :class_name => 'Report', :foreign_key => 'cause_report_id' # report which caused this work order 
    16   has_one :effect_report, :class_name => 'Report', :foreign_key => 'cause_work_order_id' # report which was caused by this work order 
     15  belongs_to :cause_form, :class_name => 'Form', :foreign_key => 'cause_form_id' # form which caused this work order 
     16  has_one :effect_form, :class_name => 'Form', :foreign_key => 'cause_work_order_id' # form which was caused by this work order 
    1717  has_many :work_order_events, :dependent => :delete_all 
    1818  has_many :data_permissions, :dependent => :delete_all, :class_name => 'WorkOrderPermission' 
    …… 
    296296  end 
    297297 
    298   # Returns array of report ids found in the long description field. 
    299   def associated_report_ids 
     298  # Returns array of form ids found in the long description field. 
     299  def associated_form_ids 
    300300    return [] unless self.long_description 
    301301 

  • branches/workorder_report_rename/app/views/asset_permission/edit.rhtml

    r53 r455  
    4545    <h3><%= _('Default permissions for reports created by user group "%s"', h(@user_group.name)) %></h3> 
    4646    <%= render(:partial => 'profiles', :object => @report_permission_profiles, 
    47                :locals => {:type => 'ReportPermissionProfile', 
     47               :locals => {:type => 'FormPermissionProfile', 
    4848                           :available_groups => @report_available_groups, 
    4949                           :view_text => _('View report'), 

  • branches/workorder_report_rename/app/views/data_permission/edit.rhtml

    r126 r455  
    11<% 
    22case @object.class.to_s 
    3   when 'Report' 
     3  when 'Form' 
    44    view_text = _('View report') 
    55    edit_text = _('Edit report') 

  • branches/workorder_report_rename/app/views/data_permission/preview.rhtml

    r2 r455  
    11<% 
    22case @datatype 
    3   when 'Report' 
     3  when 'Form' 
    44    view_text = _('View report') 
    55    edit_text = _('Edit report') 

  • branches/workorder_report_rename/app/views/keyring/online_help__general.rhtml

    r125 r455  
    33 
    44<p> 
    5   <%= _("Keyrings are collections of keys. They enable you to control access to different functions of NorfelloCMMS in a higher level. By giving a keyring to user, you are giving the user the right to use the functions protected by that keyring. For example you could have a keyring named 'Report creator' which would include all the keys necessary to create a new report. You would then give this keyring to all users that need to create reports.") %> 
     5  <%= _("Keyrings are collections of keys. They enable you to control access to different functions of NorfelloCMMS in a higher level. By giving a keyring to user, you are giving the user the right to use the functions protected by that keyring. For example you could have a keyring named 'Form creator' which would include all the keys necessary to create a new report. You would then give this keyring to all users that need to create reports.") %> 
    66</p> 
    77 

  • branches/workorder_report_rename/app/views/online_help/_index.rhtml

    r125 r455  
    2727</ul> 
    2828<ul class="tree"> 
    29 <li><%= link_to(_('Report categories'), :controller => 'online_help', :action => 'view', :kontroller => 'report_category', :page => 'general') %></li> 
     29<li><%= link_to(_('Form categories'), :controller => 'online_help', :action => 'view', :kontroller => 'report_category', :page => 'general') %></li> 
    3030</ul> 
    3131<ul class="tree"> 
    32 <li><%= link_to(_('Report types'), :controller => 'online_help', :action => 'view', :kontroller => 'report_type', :page => 'general') %></li> 
     32<li><%= link_to(_('Form types'), :controller => 'online_help', :action => 'view', :kontroller => 'report_type', :page => 'general') %></li> 
    3333</ul> 
    3434<ul class="tree"> 
    35 <li><%= link_to(_('Reports'), :controller => 'online_help', :action => 'view', :kontroller => 'report', :page => 'general') %></li> 
     35<li><%= link_to(_('Forms'), :controller => 'online_help', :action => 'view', :kontroller => 'report', :page => 'general') %></li> 
    3636</ul> 
    3737<ul class="tree"> 

  • branches/workorder_report_rename/app/views/overview/executive_view.rhtml

    r179 r455  
    22  <tr> 
    33    <th><%= _('Resource usage') %></th> 
    4     <th><%= _('Reports by type') %></th> 
     4    <th><%= _('Forms by type') %></th> 
    55  </tr> 
    66  <tr> 

  • branches/workorder_report_rename/app/views/shared/_list_items.rhtml

    r343 r455  
    122122                when 'WorkOrder' 
    123123                  link_to_work_order(value, true) 
    124                 when 'Report' 
     124                when 'Form' 
    125125                  link_to_report(value, true) 
    126126                when 'Attachment' 
    127127                  link_to_attachment(value, true) 
    128                 when 'ReportTemplate' 
     128                when 'FormTemplate' 
    129129                  image_tag('16x16/download') + 
    130130                    link_to(_('Download'), :controller => 'report_type', :action => 'download_template', :id => value.id) 
    …… 
    137137                when 'AssetTypeIcon' 
    138138                  "<img src=\"#{url_for(:controller => 'asset_type_icon', :action => 'view', :id => value.id)}\" alt=\"\" />" 
    139                 when 'ReportTag', 'WorkOrderTag' 
     139                when 'FormTag', 'WorkOrderTag' 
    140140                  h(value.name) 
    141141                when 'FalseClass' 

  • branches/workorder_report_rename/app/views/timeline/_display_event.rhtml

    r370 r455  
    2727    </span> 
    2828 
    29   <% when 'ReportEvent' -%> 
     29  <% when 'FormEvent' -%> 
    3030    <%= link_to_asset(event.report.asset) if show_asset_link %> 
    3131    <%= link_to_report(event.report) %> 
    …… 
    3434      <%= 
    3535      case event.event_type 
    36         when ReportEvent.TYPES[:CREATED] 
     36        when FormEvent.TYPES[:CREATED] 
    3737          _('Created by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 
    38         when ReportEvent.TYPES[:MODIFIED] 
     38        when FormEvent.TYPES[:MODIFIED] 
    3939          _('Modified by %s', event.creator ? event.creator.login_and_name : _('Unknown')) 
    4040      end 

  • branches/workorder_report_rename/app/views/timeline/online_help__index.rhtml

    r125 r455  
    99  <%= _('Timeline lists the following events:') %> 
    1010  <ul> 
    11     <li><%= _('Report was created</li>') %></li> 
    12     <li><%= _('Report was modified') %></li> 
     11    <li><%= _('Form was created</li>') %></li> 
     12    <li><%= _('Form was modified') %></li> 
    1313    <li><%= _('Work order was created') %></li> 
    1414    <li><%= _('Work order was assigned to user') %></li> 

  • branches/workorder_report_rename/app/views/work_order/view.rhtml

    r370 r455  
    6363                    {:action => 'download', :id => @work_order.id}) %></td> 
    6464    <% if @work_order.is_closed? -%> 
    65       <% if @work_order.effect_report.is_a?(Report) -%> 
     65      <% if @work_order.effect_report.is_a?(Form) -%> 
    6666        <td><%= _('Effect report') + ': ' + link_to_report(@work_order.effect_report, true) %></td> 
    6767      <% elsif work_order_tag = @work_order.work_order_tag and 

  • branches/workorder_report_rename/config/environments/development.rb

    r2 r455  
    1212config.breakpoint_server = true 
    1313 
    14 # Show full error reports and disable caching 
     14# Show full error forms and disable caching 
    1515config.action_controller.consider_all_requests_local = true 
    1616config.action_controller.perform_caching             = false 

  • branches/workorder_report_rename/config/environments/production.rb

    r2 r455  
    88# config.logger = SyslogLogger.new 
    99 
    10 # Full error reports are disabled and caching is turned on 
     10# Full error forms are disabled and caching is turned on 
    1111config.action_controller.consider_all_requests_local = false 
    1212config.action_controller.perform_caching             = true 

  • branches/workorder_report_rename/config/environments/test.rb

    r2 r455  
    1010config.whiny_nils = true 
    1111 
    12 # Show full error reports and disable caching 
     12# Show full error forms and disable caching 
    1313config.action_controller.consider_all_requests_local = true 
    1414config.action_controller.perform_caching             = false 

  • branches/workorder_report_rename/config/menu.rb

    r441 r455  
    3535                  ), 
    3636                  MenuButton.new(_('Forms'), '22x22/menu_form.gif', 
    37                     MenuItem.new(_('List'), 'report', 'list', '16x16/list.gif'), 
    38                     MenuItem.new(_('Create'), 'report', 'select_report_type', '16x16/create.gif'), 
    39                     MenuItem.new(_('Search'), 'report', 'search', '16x16/search.gif'), 
    40                     Page.new('report', 'view'), 
    41                     Page.new('report', 'create'), 
    42                     Page.new('report', 'edit') 
     37                    MenuItem.new(_('List'), 'form', 'list', '16x16/list.gif'), 
     38                    MenuItem.new(_('Create'), 'form', 'select_form_type', '16x16/create.gif'), 
     39                    MenuItem.new(_('Search'), 'form', 'search', '16x16/search.gif'), 
     40                    Page.new('form', 'view'), 
     41                    Page.new('form', 'create'), 
     42                    Page.new('form', 'edit') 
    4343                  ), 
    4444                  MenuButton.new(_('Work orders'), '22x22/menu_work_order.gif', 
    …… 
    9797                    ) 
    9898                  ), 
    99                   MenuButton.new(_('Report types'), '22x22/menu_report_type.gif', 
    100                     MenuButton.new(_('Report types'), '22x22/menu_report_type.gif', 
    101                       MenuItem.new(_('List'), 'report_type', 'list', '16x16/list.gif'), 
    102                       MenuItem.new(_('Create'), 'report_type', 'create_step1', '16x16/create.gif'), 
    103                       Page.new('report_type', 'create_step2'), 
    104                       Page.new('report_type', 'create_step3'), 
    105                       Page.new('report_type', 'create_step4'), 
    106                       Page.new('report_type', 'update_report_fields'), 
    107                       Page.new('report_type', 'update_report_field_groups'), 
    108                       Page.new('report_type', 'add_report_field_group'), 
    109                       Page.new('report_type', 'add_enumerated_value'), 
    110                       Page.new('report_type', 'remove_enumerated_value'), 
    111                       Page.new('report_type', 'preview'), 
    112                       Page.new('report_type', 'edit'), 
    113                       Page.new('report_type', 'change_template') 
     99                  MenuButton.new(_('Form types'), '22x22/menu_form_type.gif', 
     100                    MenuButton.new(_('Form types'), '22x22/menu_form_type.gif', 
     101                      MenuItem.new(_('List'), 'form_type', 'list', '16x16/list.gif'), 
     102                      MenuItem.new(_('Create'), 'form_type', 'create_step1', '16x16/create.gif'), 
     103                      Page.new('form_type', 'create_step2'), 
     104                      Page.new('form_type', 'create_step3'), 
     105                      Page.new('form_type', 'create_step4'), 
     106                      Page.new('form_type', 'update_form_fields'), 
     107                      Page.new('form_type', 'update_form_field_groups'), 
     108                      Page.new('form_type', 'add_form_field_group'), 
     109                      Page.new('form_type', 'add_enumerated_value'), 
     110                      Page.new('form_type', 'remove_enumerated_value'), 
     111                      Page.new('form_type', 'preview'), 
     112                      Page.new('form_type', 'edit'), 
     113                      Page.new('form_type', 'change_template') 
    114114                    ), 
    115                     MenuButton.new(_('Report categories'), '22x22/menu_report_category.gif', 
    116                       MenuItem.new(_('List'), 'report_category', 'list', '16x16/list.gif'), 
    117                       MenuItem.new(_('Tree'), 'report_category', 'view_as_tree', '16x16/view_tree.gif'), 
    118                       MenuItem.new(_('Create'), 'report_category', 'create', '16x16/create.gif'), 
    119                       Page.new('report_category', 'edit') 
     115                    MenuButton.new(_('Form categories'), '22x22/menu_form_category.gif',