Changeset 749

Show
Ignore:
Timestamp:
02/21/08 18:50:54 (11 months ago)
Author:
markku
Message:

1. Closes #530:

2. Closes #531.
3. Also fixed headers not translated in the action key list.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/action_key_controller.rb

    r718 r749  
    1515  def list 
    1616    @title = _('Keys') 
    17     @fields = [['Name (controller/action)', :name, 'name'], ['Information', :info, 'info']] 
    18     @items = items_for_page(ActionKey) 
     17    @fields = [ 
     18                [_('Name (controller/action)'), :name, 'name'], 
     19                [_('Information'), :info, 'info'] 
     20              ] 
     21    @items = items_for_page(ActionKey, :order => 'name') 
    1922    common_list 
    2023  end 

  • trunk/app/controllers/application.rb

    r747 r749  
    660660    @items_limit ||= 20 
    661661    @items_offset ||= (params[:items_offset].to_i || 0) 
    662     sort_sql = (@fields.collect { |f| f[2] })[params[:sort_column].to_i] if @fields and params[:sort_column] 
    663     sort_sql += ' DESC' if sort_sql and params[:sort_desc] 
    664     @sort_column = params[:sort_column].to_i if params[:sort_column] 
    665     @sort_desc = 1 if params[:sort_desc] 
    666     return finder.send(finder_method, :all, {:readonly => true, :limit => @items_limit, :offset => @items_offset, :order => sort_sql}.merge(options)) 
     662    # Sorting params overwrite :order in options 
     663    if @fields and params[:sort_column] 
     664      @sort_column = params[:sort_column].to_i 
     665      if @sort_column < @fields.size 
     666        sort_sql = (@fields.collect { |f| f[2] })[@sort_column] 
     667        if params[:sort_desc] 
     668          sort_sql += ' DESC' 
     669          @sort_desc = 1 
     670        end 
     671        options[:order] = sort_sql 
     672      end 
     673    end 
     674    return finder.send(finder_method, :all, {:readonly => true, :limit => @items_limit, :offset => @items_offset}.merge(options)) 
    667675  end 
    668676 

  • trunk/app/controllers/asset_type_controller.rb

    r718 r749  
    1616    @title = _('Asset types') 
    1717    @fields = [ 
    18                 [_('Name'), :name], 
    19                 [_('Icon'), :asset_type_icon], 
     18                [_('Name'), :name, 'name'], 
     19                [_('Icon'), :asset_type_icon, 'asset_type_icon_id'], 
    2020              ] 
    2121    @actions = [ 

  • trunk/app/controllers/asset_type_icon_controller.rb

    r718 r749  
    2121                [_('Icon'), :self] 
    2222              ] 
    23     @items = items_for_page(AssetTypeIcon) 
     23    @items = items_for_page(AssetTypeIcon, :order => 'id') 
    2424    @actions = [ ] 
    2525    common_list 

  • trunk/app/controllers/attachment_controller.rb

    r701 r749  
    2020  def list 
    2121    @fields = [ 
    22       [_('Attachment'), :self], 
     22      [_('Attachment'), :self, 'attachments.id'], 
    2323      [_('Name'), :name_or_filename], 
    24       [_('Creator'), :creator], 
    25       [_('Creation date'), :created_at], 
    26       [_('Asset'), :asset] 
     24      [_('Creator'), :creator, 'created_by'], 
     25      [_('Creation date'), :created_at, 'attachments.created_at'], 
     26      [_('Asset'), :asset, 'asset_id'] 
    2727    ] 
    2828    @actions = [ 
    …… 
    3838    find_selected_assets 
    3939 
    40     @items_limit = 20 
    41     @items_offset = params[:items_offset].to_i || 0 
    42     @items = Attachment.find_authorized_to_read_without(:data, :all, :conditions => @selected_assets_condition, :offset => @items_offset, :limit => @items_limit, :order => 'attachments.created_at DESC', :include => [:asset, :creator]) 
     40    @items = items_for_page(Attachment, :finder_method => :find_authorized_to_read_without_data, :conditions => @selected_assets_condition, :order => 'attachments.id DESC', :include => [:asset, :creator]) 
     41 
    4342    @items_count = (@items.size < @items_limit) ? @items_offset + @items.size : Attachment.count_authorized_to(:read, @selected_assets_condition) 
    4443 

  • trunk/app/controllers/customer_controller.rb

    r725 r749  
    2626    @title = _('Customers') 
    2727    @fields = [ 
    28                [_('Name'), :name], 
    29                [_('Username'), :login], 
     28               [_('Name'), :name, 'full_name'], 
     29               [_('Username'), :login, 'login'], 
    3030               [_('Assets'), :asset_count] 
    3131              ] 

  • trunk/app/controllers/form_type_controller.rb

    r718 r749  
    2525                [_('Template'), :form_template] 
    2626              ] 
    27     @items = items_for_page(FormType, :conditions => ['ready = ?', true]) 
     27    @items = items_for_page(FormType, :conditions => ['ready = ?', true], :order => 'name') 
    2828    @actions ||= [ 
    2929                  [_('Edit'), {:action=> 'edit', :image=>'16x16/edit.gif'}], 

  • trunk/app/controllers/keyring_controller.rb

    r718 r749  
    1515  def list 
    1616    @title = _('Keyrings') 
     17    @fields = [ 
     18                [_('Name'), :name, 'name'], 
     19                [_('Information'), :info, 'info'] 
     20              ] 
    1721    @items = items_for_page(Keyring, :order => 'name') 
    18     @fields = [ 
    19                 [_('Name'), :name], 
    20                 [_('Information'), :info] 
    21               ] 
    2222    @actions = [ 
    23                   [_('Keys'), {:action=>'edit_keys', :image=>'16x16/keys.png'}], 
    24                   [_('Owners'), {:action=>'edit_owners', :image=>'16x16/user_group.png'}], 
    25                   [_('Edit'), {:action=>'edit', :image=>'16x16/edit.gif'}] 
     23                 [_('Keys'), {:action=>'edit_keys', :image=>'16x16/keys.png'}], 
     24                 [_('Owners'), {:action=>'edit_owners', :image=>'16x16/user_group.png'}], 
     25                 [_('Edit'), {:action=>'edit', :image=>'16x16/edit.gif'}] 
    2626               ] 
    2727    common_list 
    …… 
    6666    @keyring = Keyring.find params[:id], :readonly => true 
    6767    @items_count = @keyring.action_keys.count 
    68     @items = items_for_page(@keyring.action_keys) 
    6968    @title = _('Keys in the keyring %s', @keyring.name) 
    7069    @fields = [ 
    71                 [_('Key'), :name], 
    72                 [_('Information'), :info] 
     70                [_('Key'), :name, 'name'], 
     71                [_('Information'), :info, 'info'] 
    7372              ] 
     73    @items = items_for_page(@keyring.action_keys) 
    7474    @actions = [] 
    7575    @check_title = _('Remove') 

  • trunk/app/controllers/task_controller.rb

    r747 r749  
    6464    conditions.push(TaskType.get_service_request_type.id) 
    6565 
    66     @items = items_for_page(Task, :finder_method => :find_authorized_to_read, :conditions => conditions, :readonly => true) 
     66    @items = items_for_page(Task, :finder_method => :find_authorized_to_read, :conditions => conditions, :order => 'id') 
    6767    common_list 
    6868  end 
    …… 
    390390    conditions.push(TaskType.get_service_request_type.id) 
    391391 
    392     @items = items_for_page(Task, :finder_method => :find_authorized_to_read, :conditions => conditions, :readonly => true) 
     392    @items = items_for_page(Task, :finder_method => :find_authorized_to_read, :conditions => conditions, :order => 'id') 
    393393    common_list 
    394394  end 
    …… 
    404404 
    405405    @items = items_for_page(Task, :finder_method => :find_authorized_to_read, 
    406                             :conditions => ['task_type_id = ? AND state = ?', TaskType.get_service_request_type.id, Task.NEW], 
    407                             :readonly => true) 
     406                            :conditions => ['task_type_id = ? AND state = ?', TaskType.get_service_request_type.id, Task.NEW]) 
    408407    common_list 
    409408  end 

  • trunk/app/controllers/task_type_controller.rb

    r718 r749  
    1818  def list 
    1919    @title = _('Task types') 
    20     @fields = [ [_('Name'), :name], 
    21                 [_('Notification address'), :notification_email], 
    22                 [_('Description'), :description], 
     20    @fields = [ [_('Name'), :name, 'name'], 
     21                [_('Notification address'), :notification_email, 'notification_email'], 
     22                [_('Description'), :description, 'description'], 
    2323                [_('Template'), :task_template], 
    2424                [_('Task count'), :task_count] 

  • trunk/app/controllers/type_attachment_controller.rb

    r701 r749  
    1717  def list 
    1818    @fields = [ 
    19       [_('Attachment'), :self], 
     19      [_('Attachment'), :self, 'type_attachments.id'], 
    2020      [_('Name'), :name_or_filename], 
    21       [_('Creator'), :creator], 
    22       [_('Creation date'), :created_at], 
    23       [_('Asset type'), :asset_type] 
     21      [_('Creator'), :creator, 'created_by'], 
     22      [_('Creation date'), :created_at, 'type_attachments.created_at'], 
     23      [_('Asset type'), :asset_type, 'asset_type_id'] 
    2424    ] 
    2525    @actions = [ 
    2626      [_('Download'), {:action => 'download', :image => '16x16/download.png'}] 
    2727    ] 
    28  
    29     find_selected_assets 
    3028 
    3129    if session[:select_branches] 
    …… 
    3533    end 
    3634 
     35    find_selected_assets 
    3736 
    38     @items_limit = 20 
    39     @items_offset = params[:items_offset].to_i || 0 
    40     @items = TypeAttachment.find_authorized_to_read_without(:data, :all, :conditions => @selected_asset_types_condition, :order => 'type_attachments.created_at DESC', :include => [:asset_type, :creator]) 
     37    @items = items_for_page(TypeAttachment, :finder_method => :find_authorized_to_read_without_data, :conditions => @selected_asset_types_condition, :order => 'type_attachments.id DESC', :include => [:asset_type, :creator]) 
    4138 
    42     # FIXME: We should use :limit and :offset on the finds above instead of doing this. But this way we get the count easily... 
    43     @items_count = @items.size 
    44     @items = @items[@items_offset..(@items_offset + @items_limit - 1)] 
     39    @items_count = (@items.size < @items_limit) ? @items_offset + @items.size : TypeAttachment.count_authorized_to(:read, @selected_asset_types_condition) 
    4540 
    4641    # Render remove items form? 

  • trunk/app/controllers/user_group_controller.rb

    r718 r749  
    1919  def list 
    2020    @title = _('User groups') 
     21    @fields = [ [_('Name'), :name, 'name'], 
     22                [_('Information'), :info, 'info'] 
     23              ] 
    2124    @items = items_for_page(UserGroup, :order => 'name') 
    22     @fields = [ [_('Name'), :name], 
    23                 [_('Information'), :info] 
    24               ] 
    2525    @actions = [ [_('Users'), {:action => 'users', :image => '16x16/user_group.png' }], 
    2626                 [_('Edit'), {:action => 'edit', :image => '16x16/edit.gif' }] 
    …… 
    2828    # Render remove user groups form? 
    2929    @check = session[:user].authorized?(LoginSystem::ActionKeyMapper.keys_for('user_group', 'remove')) 
    30     common_list 
     30    common_list 
    3131  end 
    3232 

  • trunk/app/models/attachment_methods.rb

    r508 r749  
    55module AttachmentMethods 
    66  MAX_SIZE = 5.megabytes # TODO: Discuss this! 
     7 
     8    # Method: included 
     9    # =================== 
     10    # Hook that creates the class method(s) 
     11    def self.included(klass) 
     12      # Method: klass.find_authorized_to_read_without_data 
     13      # ================================================== 
     14      # Returns objects, which the user is authorized to read (like 
     15      # find_authorized_to_read), without the data attribute. 
     16      # 
     17      def klass.find_authorized_to_read_without_data(*args) 
     18        find_authorized_to_read_without(:data, *args) 
     19      end 
     20    end 
    721 
    822  # Setter for file field data 
    …… 
    4660 
    4761  # Returns true if the attachment is an image file 
    48   def is_image?  
     62  def is_image? 
    4963    self.content_type.match(/^image\//) != nil 
    5064  end 

  • trunk/app/views/shared/_list_items.rhtml

    r701 r749  
    321321                when 'Attachment' 
    322322                  link_to_attachment(value, true) 
     323                when 'TypeAttachment' 
     324                  link_to_type_attachment(value, true) 
    323325                when 'FormTemplate' 
    324326                  image_tag('16x16/download.png') + 

  • trunk/po/fi_FI/norfello_cmms.po

    r743 r749  
    22msgstr "" 
    33"Project-Id-Version: NorfelloCMMS SVN trunk\n" 
    4 "POT-Creation-Date: 2008-01-31 19:21+0200\n" 
    5 "PO-Revision-Date: 2008-01-31 19:33+0200\n" 
     4"POT-Creation-Date: 2008-02-21 13:57+0200\n" 
     5"PO-Revision-Date: 2008-02-21 13:59+0200\n" 
    66"Last-Translator: Markku Oksanen <markku.oksanen@norfello.com>\n" 
    77"Language-Team: Norfello Ltd. <contact@norfello.com>\n" 
    …… 
    132132 
    133133#: app/models/form_field.rb:41 
    134 #: app/controllers/customer_interface_controller.rb:46 
     134#: app/controllers/customer_interface_controller.rb:47 
    135135#: app/controllers/asset_field_controller.rb:114 
    136136msgid "Time" 
    …… 
    319319#: app/helpers/customer_interface_helper.rb:176 
    320320#: app/helpers/customer_interface_helper.rb:195 
    321 #: app/controllers/customer_interface_controller.rb:161 
     321#: app/controllers/customer_interface_controller.rb:162 
    322322#: app/views/task/_display_task_event.rhtml:6 
    323323#: app/views/task/_display_task_event.rhtml:8 
    …… 
    674674#: app/helpers/customer_interface_helper.rb:71 
    675675#: app/helpers/application_helper.rb:428 
    676 #: app/controllers/form_controller.rb:480 
     676#: app/controllers/form_controller.rb:483 
    677677msgid "Form" 
    678678msgstr "Lomake" 
    …… 
    688688 
    689689#: app/helpers/customer_interface_helper.rb:100 
    690 #: app/controllers/customer_interface_controller.rb:255 
     690#: app/controllers/customer_interface_controller.rb:256 
    691691msgid "Comment service request %s" 
    692692msgstr "Kommentoi palvelupyyntöÀ %s" 
    …… 
    897897#: app/views/task/_form.rhtml:96 
    898898#: app/views/task/_form.rhtml:98 
    899 #: app/views/task/print_view.rhtml:69 
    900 #: app/views/task/print_view.rhtml:71 
     899#: app/views/task/print_view.rhtml:36 
     900#: app/views/task/print_view.rhtml:38 
    901901#: app/views/task/create.rhtml:39 
    902902msgid "hours" 
    …… 
    914914msgid "no" 
    915915msgstr "ei" 
     916 
     917#: app/helpers/application_helper.rb:844 
     918#: app/views/shared/_list_items.rhtml:313 
     919#: app/views/shared/export_items_csv.rhtml:39 
     920#: app/views/form/remove.rhtml:5 
     921#: app/views/customer_interface/_item_list.rhtml:66 
     922msgid "Yes" 
     923msgstr "KyllÀ" 
     924 
     925#: app/helpers/application_helper.rb:844 
     926#: app/views/shared/_list_items.rhtml:311 
     927#: app/views/shared/export_items_csv.rhtml:37 
     928#: app/views/customer_interface/_item_list.rhtml:64 
     929msgid "No" 
     930msgstr "Ei" 
    916931 
    917932#: app/helpers/asset_field_helper.rb:52 
    …… 
    941956 
    942957#: app/controllers/asset_controller.rb:30 
    943 #: app/views/task/print_view.rhtml:81 
     958#: app/views/task/print_view.rhtml:54 
    944959msgid "Asset information" 
    945960msgstr "Kohteen tiedot " 
    …… 
    966981 
    967982#: app/controllers/asset_controller.rb:61 
    968 #: app/controllers/customer_interface_controller.rb:47 
    969 #: app/controllers/customer_interface_controller.rb:164 
    970 #: app/controllers/form_controller.rb:479 
     983#: app/controllers/customer_interface_controller.rb:48 
     984#: app/controllers/customer_interface_controller.rb:165 
     985#: app/controllers/form_controller.rb:482 
    971986#: app/controllers/task_controller.rb:43 
    972987#: app/controllers/task_controller.rb:52 
    …… 
    977992#: app/views/attachment/view.rhtml:4 
    978993#: app/views/task/_form.rhtml:51 
     994#: app/views/debug.rhtml:4 
    979995#: app/views/form/view.rhtml:13 
    980996#: app/views/customer_interface/comment_service_request.rhtml:4 
    …… 
    9891005#: app/controllers/task_type_controller.rb:37 
    9901006#: app/controllers/task_type_controller.rb:52 
    991 #: app/controllers/customer_interface_controller.rb:210 
    992 #: app/controllers/user_group_controller.rb:22 
     1007#: app/controllers/customer_interface_controller.rb:211 
     1008#: app/controllers/user_group_controller.rb:21 
    9931009#: app/controllers/user_group_controller.rb:40 
    9941010#: app/controllers/user_group_controller.rb:62 
    …… 
    10001016#: app/controllers/customer_controller.rb:50 
    10011017#: app/controllers/customer_controller.rb:77 
    1002 #: app/controllers/action_key_controller.rb:25 
    1003 #: app/controllers/action_key_controller.rb:34 
     1018#: app/controllers/action_key_controller.rb:28 
     1019#: app/controllers/action_key_controller.rb:37 
    10041020#: app/controllers/asset_field_controller.rb:21 
    10051021#: app/controllers/asset_field_controller.rb:41 
    …… 
    10141030#: app/controllers/form_type_controller.rb:22 
    10151031#: app/controllers/type_attachment_controller.rb:20 
    1016 #: app/controllers/keyring_controller.rb:19 
     1032#: app/controllers/keyring_controller.rb:18 
    10171033#: app/controllers/keyring_controller.rb:33 
    10181034#: app/controllers/keyring_controller.rb:51 
    …… 
    10201036#: app/views/attachment/attach.rhtml:9 
    10211037#: app/views/asset_tree/search.rhtml:4 
    1022 #: app/views/task/print_view.rhtml:90 
     1038#: app/views/task/print_view.rhtml:64 
    10231039#: app/views/form_type/create_step2.rhtml:6 
    10241040#: app/views/form_type/create_step4.rhtml:9 
    …… 
    10661082#: app/controllers/asset_controller.rb:140 
    10671083#: app/controllers/asset_controller.rb:247 
    1068 #: app/views/task/print_view.rhtml:86 
     1084#: app/views/task/print_view.rhtml:60 
    10691085#: app/views/asset/_view_table.rhtml:16 
    10701086msgid "Code" 
    …… 
    10731089#: app/controllers/asset_controller.rb:143 
    10741090#: app/controllers/asset_controller.rb:250 
    1075 #: app/views/task/print_view.rhtml:95 
     1091#: app/views/task/print_view.rhtml:69 
    10761092#: app/views/asset/_view_table.rhtml:25 
    10771093msgid "Customer" 
    …… 
    10831099#: app/controllers/task_type_controller.rb:38 
    10841100#: app/controllers/task_type_controller.rb:53 
    1085 #: app/controllers/customer_interface_controller.rb:165 
     1101#: app/controllers/customer_interface_controller.rb:166 
    10861102#: app/controllers/asset_type_controller.rb:46 
    10871103#: app/controllers/asset_type_controller.rb:56 
    …… 
    10931109#: app/controllers/user_controller.rb:112 
    10941110#: app/views/task/_form.rhtml:108 
    1095 #: app/views/task/print_view.rhtml:73 
    1096 #: app/views/task/print_view.rhtml:112 
     1111#: app/views/task/print_view.rhtml:46 
     1112#: app/views/task/print_view.rhtml:86 
    10971113#: app/views/asset/_view_table.rhtml:40 
    10981114msgid "Description" 
    …… 
    11051121#: app/controllers/asset_controller.rb:160 
    11061122#: app/controllers/asset_controller.rb:182 
    1107 #: app/controllers/form_controller.rb:455 
     1123#: app/controllers/form_controller.rb:438 
    11081124#: app/controllers/task_controller.rb:308 
    11091125#: app/controllers/attachment_controller.rb:128 
    …… 
    11431159#: app/controllers/asset_controller.rb:265 
    11441160#: app/controllers/asset_controller.rb:315 
    1145 #: app/controllers/form_controller.rb:152 
     1161#: app/controllers/form_controller.rb:154 
    11461162#: app/controllers/task_controller.rb:149 
    11471163#: app/controllers/task_controller.rb:259 
    …… 
    11881204#: app/controllers/user_group_controller.rb:26 
    11891205#: app/controllers/asset_type_controller.rb:23 
    1190 #: app/controllers/form_controller.rb:484 
     1206#: app/controllers/form_controller.rb:487 
    11911207#: app/controllers/customer_controller.rb:33 
    11921208#: app/controllers/asset_field_controller.rb:27 
    …… 
    12741290msgstr "Muokkaa oikeuksienhallinnan asetuksia" 
    12751291 
    1276 #: app/controllers/customer_interface_controller.rb:48 
     1292#: app/controllers/customer_interface_controller.rb:49 
    12771293msgid "Action" 
    12781294msgstr "Tapahtuma" 
    12791295 
    1280 #: app/controllers/customer_interface_controller.rb:110 
     1296#: app/controllers/customer_interface_controller.rb:111 
    12811297#: app/controllers/message_controller.rb:21 
    12821298#: app/views/message/send_message.rhtml:21 
    …… 
    12851301msgstr "Aihe" 
    12861302 
    1287 #: app/controllers/customer_interface_controller.rb:111 
     1303#: app/controllers/customer_interface_controller.rb:112 
    12881304msgid "Status" 
    12891305msgstr "Tila" 
    12901306 
    1291 #: app/controllers/customer_interface_controller.rb:112 
     1307#: app/controllers/customer_interface_controller.rb:113 
    12921308msgid "Last updated" 
    12931309msgstr "Muokattu" 
    12941310 
    1295 #: app/controllers/customer_interface_controller.rb:158 
     1311#: app/controllers/customer_interface_controller.rb:159 
    12961312#: app/views/layouts/customer_interface.rhtml:58 
    12971313msgid "Submit service request" 
    12981314msgstr "LÀhetÀ palvelupyyntö" 
    12991315 
    1300 #: app/controllers/customer_interface_controller.rb:163 
     1316#: app/controllers/customer_interface_controller.rb:164 
    13011317msgid "Summary" 
    13021318msgstr "Yhteenveto" 
    13031319 
    1304 #: app/controllers/customer_interface_controller.rb:186 
     1320#: app/controllers/customer_interface_controller.rb:187 
    13051321msgid "Service request %s successfully received" 
    13061322msgstr "Palvelupyyntö %s vastaanotettu" 
    13071323 
    1308 #: app/controllers/customer_interface_controller.rb:190 
     1324#: app/controllers/customer_interface_controller.rb:191 
    13091325msgid "Submitting" 
    13101326msgstr "LÀhetys" 
    13111327 
    1312 #: app/controllers/customer_interface_controller.rb:198 
     1328#: app/controllers/customer_interface_controller.rb:199 
    13131329#: app/views/customer_interface/comment_service_request.rhtml:15 
    13141330msgid "Submit" 
    13151331msgstr "LÀhetÀ" 
    13161332 
    1317 #: app/controllers/customer_interface_controller.rb:206 
     1333#: app/controllers/customer_interface_controller.rb:207 
    13181334#: app/controllers/user_controller.rb:314 
    13191335#: app/views/layouts/customer_interface.rhtml:50 
    …… 
    13221338msgstr "Omat tiedot" 
    13231339 
    1324 #: app/controllers/customer_interface_controller.rb:211 
     1340#: app/controllers/customer_interface_controller.rb:212 
    13251341#: app/controllers/customer_controller.rb:29 
    13261342#: app/controllers/customer_controller.rb:47 
    …… 
    13351351msgstr "KÀyttÀjÀnimi" 
    13361352 
    1337 #: app/controllers/customer_interface_controller.rb:212 
     1353#: app/controllers/customer_interface_controller.rb:213 
    13381354#: app/controllers/customer_controller.rb:52 
    13391355#: app/controllers/customer_controller.rb:79 
    …… 
    13451361msgstr "SÀhköpostiosoite" 
    13461362 
    1347 #: app/controllers/customer_interface_controller.rb:213 
     1363#: app/controllers/customer_interface_controller.rb:214 
    13481364#: app/controllers/customer_controller.rb:53 
    13491365#: app/controllers/customer_controller.rb:80 
    …… 
    13551371msgstr "Puhelinnumero" 
    13561372 
    1357 #: app/controllers/customer_interface_controller.rb:214 
     1373#: app/controllers/customer_interface_controller.rb:215 
    13581374#: app/controllers/customer_controller.rb:54 
    13591375#: app/controllers/customer_controller.rb:81 
    …… 
    13651381msgstr "Kaupunki" 
    13661382 
    1367 #: app/controllers/customer_interface_controller.rb:215 
     1383#: app/controllers/customer_interface_controller.rb:216 
    13681384#: app/controllers/customer_controller.rb:55 
    13691385#: app/controllers/customer_controller.rb:82 
    …… 
    13751391msgstr "Maa" 
    13761392 
    1377 #: app/controllers/customer_interface_controller.rb:216 
     1393#: app/controllers/customer_interface_controller.rb:217 
    13781394msgid "Send me notification when a service request is created" 
    13791395msgstr "LÀhetÀ minulle ilmoitus kun palvelupyyntö luodaan" 
    13801396 
    1381 #: app/controllers/customer_interface_controller.rb:217 
     1397#: app/controllers/customer_interface_controller.rb:218 
    13821398msgid "Send me notification when a service request is assigned to a person" 
    13831399msgstr "LÀhetÀ minulle ilmoitus kun palvelupyyntö mÀÀrÀtÀÀn henkilölle" 
    13841400 
    1385 #: app/controllers/customer_interface_controller.rb:218 
     1401#: app/controllers/customer_interface_controller.rb:219 
    13861402msgid "Send me notification when a service request is accepted by a person" 
    13871403msgstr "LÀhetÀ minulle ilmoitus kun palvelupyyntö hyvÀksytÀÀn" 
    13881404 
    1389 #: app/controllers/customer_interface_controller.rb:219 
     1405#: app/controllers/customer_interface_controller.rb:220 
    13901406msgid "Send me notification when a service request is closed" 
    13911407msgstr "LÀhetÀ minulle ilmoitus kun palvelupyyntö suljetaan" 
    13921408 
    1393 #: app/controllers/customer_interface_controller.rb:220 
     1409#: app/controllers/customer_interface_controller.rb:221 
    13941410msgid "Send me notification when a service request is reopened" 
    13951411msgstr "LÀhetÀ minulle ilmoitus kun palvelupyyntö avataan uudelleen" 
    13961412 
    1397 #: app/controllers/customer_interface_controller.rb:221 
     1413#: app/controllers/customer_interface_controller.rb:222 
    13981414#: app/controllers/customer_controller.rb:61 
    13991415#: app/controllers/customer_controller.rb:88 
    …… 
    14031419msgstr "Kieli" 
    14041420 
    1405 #: app/controllers/customer_interface_controller.rb:233 
     1421#: app/controllers/customer_interface_controller.rb:234 
    14061422#: app/controllers/user_controller.rb:344 
    14071423msgid "Your information has been updated" 
    14081424msgstr "Tiedot pÀivitetty" 
    14091425 
    1410 #: app/controllers/customer_interface_controller.rb:236 
     1426#: app/controllers/customer_interface_controller.rb:237 
    14111427#: app/controllers/user_controller.rb:346 
    14121428msgid "Unable to update your information" 
    14131429msgstr "Tietojen pÀivittÀminen epÀonnistui" 
    14141430 
    1415 #: app/controllers/customer_interface_controller.rb:258 
     1431#: app/controllers/customer_interface_controller.rb:259 
    14161432msgid "Service request %s not found!" 
    14171433msgstr "PalvelupyyntöÀ %s ei löydy!" 
    14181434 
    1419 #: app/controllers/customer_interface_controller.rb:266 
     1435#: app/controllers/customer_interface_controller.rb:267 
    14201436msgid "Comment successfully received" 
    14211437msgstr "Kommentti vastaanotettu" 
    14221438 
    1423 #: app/controllers/customer_interface_controller.rb:272 
     1439#: app/controllers/customer_interface_controller.rb:273 
    14241440msgid "Comment can't be empty. Please provide one." 
    14251441msgstr "Kommentti ei voi olla tyhjÀ. Ole hyvÀ ja tÀytÀ se." 
    14261442 
    1427 #: app/controllers/customer_interface_controller.rb:290 
    1428 #: app/controllers/form_controller.rb:355 
     1443#: app/controllers/customer_interface_controller.rb:335 
     1444#: app/controllers/form_controller.rb:552 
    14291445msgid "Filled-out form %s (%s)" 
    14301446msgstr "TÀytetty lomake %s (%s)" 
    …… 
    15241540msgstr "KÀyttÀjÀryhmÀt" 
    15251541 
    1526 #: app/controllers/user_group_controller.rb:23 
     1542#: app/controllers/user_group_controller.rb:22 
    15271543#: app/controllers/user_group_controller.rb:41 
    15281544#: app/controllers/user_group_controller.rb:63 
    15291545#: app/controllers/asset_permission_controller.rb:51 
    1530 #: app/controllers/action_key_controller.rb:26 
    1531 #: app/controllers/action_key_controller.rb:35 
    1532 #: app/controllers/keyring_controller.rb:20 
     1546#: app/controllers/action_key_controller.rb:19 
     1547#: app/controllers/action_key_controller.rb:29 
     1548#: app/controllers/action_key_controller.rb:38 
     1549#: app/controllers/keyring_controller.rb:19 
    15331550#: app/controllers/keyring_controller.rb:34 
    15341551#: app/controllers/keyring_controller.rb:52 
    1535 #: app/controllers/keyring_controller.rb:72 
     1552#: app/controllers/keyring_controller.rb:71 
    15361553msgid "Information" 
    15371554msgstr "Tiedot" 
    …… 
    16311648msgstr "Muokkaa kohdetyyppiÀ" 
    16321649 
    1633 #: app/controllers/form_controller.rb:33 
     1650#: app/controllers/form_controller.rb:35 
    16341651msgid "Filled-out forms for selected assets in branch %s" 
    16351652msgstr "Haaran %s valittujen kohteiden tÀytetyt lomakkeet" 
    16361653 
    1637 #: app/controllers/form_controller.rb:35 
     1654#: app/controllers/form_controller.rb:37 
    16381655msgid "Filled-out forms for asset %s" 
    16391656msgstr "Kohteen %s tÀytetyt lomakkeet" 
    16401657 
    1641 #: app/controllers/form_controller.rb:50 
    1642 #: app/controllers/form_controller.rb:71 
     1658#: app/controllers/form_controller.rb:52 
     1659#: app/controllers/form_controller.rb:73 
    16431660msgid "create form" 
    16441661msgstr "luo lomake" 
    16451662 
    1646 #: app/controllers/form_controller.rb:56 
     1663#: app/controllers/form_controller.rb:58 
    16471664msgid "Select the form type to fill out" 
    16481665msgstr "Valitse tÀytettÀvÀn lomakkeen tyyppi" 
    16491666 
    1650 #: app/controllers/form_controller.rb:60 
     1667#: app/controllers/form_controller.rb:62 
    16511668msgid "No form types defined." 
    16521669msgstr "YhtÀÀn lomaketyyppiÀ ei ole mÀÀritelty." 
    16531670 
    1654 #: app/controllers/form_controller.rb:62 
     1671#: app/controllers/form_controller.rb:64 
    16551672msgid "Form type" 
    16561673msgstr "Lomaketyyppi" 
    16571674 
    1658 #: app/controllers/form_controller.rb:65 
     1675#: app/controllers/form_controller.rb:67 
    16591676#: config/menu.rb:37 
    16601677msgid "Fill out" 
    16611678msgstr "TÀytÀ" 
    16621679 
    1663 #: app/controllers/form_controller.rb:75 
     1680#: app/controllers/form_controller.rb:77 
    16641681msgid "Fill out a form" 
    16651682msgstr "TÀytÀ lomake" 
    16661683 
    1667 #: app/controllers/form_controller.rb:91 
     1684#: app/controllers/form_controller.rb:93 
    16681685msgid "A closing form has already been filled for this task" 
    16691686msgstr "TÀlle tehtÀvÀlle on jo tÀytetty sulkemislomake" 
    16701687 
    1671 #: app/controllers/form_controller.rb:148 
     1688#: app/controllers/form_controller.rb:150 
    16721689#: app/views/data_permission/preview.rhtml:5 
    16731690#: app/views/data_permission/edit.rhtml:5 
    …… 
    16761693msgstr "Muuta lomaketta" 
    16771694 
    1678 #: app/controllers/form_controller.rb:267 
     1695#: app/controllers/form_controller.rb:269 
    16791696msgid "Search for filled-out forms in branch %s (%s)" 
    16801697msgstr "Etsi tÀytettyjÀ lomakkeita haarasta %s (%s)" 
    16811698 
    1682 #: app/controllers/form_controller.rb:269 
     1699#: app/controllers/form_controller.rb:271 
    16831700msgid "Search for filled-out forms in asset %s (%s)" 
    16841701msgstr "Etsi tÀytettyjÀ lomakkeita kohteesta %s (%s)" 
    16851702 
    1686 #: app/controllers/form_controller.rb:367 
     1703#: app/controllers/form_controller.rb:350 
    16871704msgid "Displaying the form" 
    16881705msgstr "Lomakkeen nÀyttÀminen" 
    16891706 
    1690 #: app/controllers/form_controller.rb:447 
     1707#: app/controllers/form_controller.rb:430 
    16911708msgid "Preparing the document for download" 
    16921709msgstr "Dokumentin valmistelu latausta varten" 
    16931710 
    1694 #: app/controllers/form_controller.rb:481 
     1711#: app/controllers/form_controller.rb:484 
    16951712#: app/controllers/attachment_controller.rb:24 
    16961713#: app/controllers/type_attachment_controller.rb:21 
    …… 
    17001717msgstr "Luoja" 
    17011718 
    1702 #: app/controllers/form_controller.rb:482 
     1719#: app/controllers/form_controller.rb:485 
    17031720#: app/controllers/attachment_controller.rb:25 
    17041721#: app/controllers/type_attachment_controller.rb:22 
    …… 
    17081725msgstr "Luotu" 
    17091726 
    1710 #: app/controllers/form_controller.rb:485 
     1727#: app/controllers/form_controller.rb:488 
    17111728#: app/controllers/attachment_controller.rb:29 
    17121729#: app/controllers/type_attachment_controller.rb:26 
    …… 
    17931810#: app/controllers/task_controller.rb:39 
    17941811#: app/views/task/_form.rhtml:79 
    1795 #: app/views/task/print_view.rhtml:62 
     1812#: app/views/task/print_view.rhtml:29 
    17961813#: app/views/task/create.rhtml:26 
    17971814msgid "Priority" 
    …… 
    18041821#: app/controllers/task_controller.rb:41 
    18051822#: app/views/task/_form.rhtml:72 
    1806 #: app/views/task/print_view.rhtml:58 
     1823#: app/views/task/print_view.rhtml:25 
    18071824#: app/views/task/create.rhtml:30 
    18081825msgid "Starting time" 
    …… 
    18111828#: app/controllers/task_controller.rb:42 
    18121829#: app/views/task/_form.rhtml:87 
    1813 #: app/views/task/print_view.rhtml:64 
     1830#: app/views/task/print_view.rhtml:31 
    18141831#: app/views/task/create.rhtml:34 
    18151832msgid "Deadline" 
    …… 
    18381855 
    18391856#: app/controllers/task_controller.rb:71 
    1840 #: app/controllers/task_controller.rb:417 
     1857#: app/controllers/task_controller.rb:416 
    18411858msgid "Task %s (%s)" 
    18421859msgstr "TehtÀvÀ %s (%s)" 
    …… 
    19631980#: app/controllers/task_controller.rb:458 
    19641981#: app/views/task/_form.rhtml:59 
    1965 #: app/views/task/print_view.rhtml:52 
     1982#: app/views/task/print_view.rhtml:19 
    19661983#: app/views/shared/_edit_account.rhtml:4 
    19671984msgid "Created at" 
    …… 
    20892106msgstr "Avaimet" 
    20902107 
    2091 #: app/controllers/action_key_controller.rb:23 
     2108#: app/controllers/action_key_controller.rb:18 
     2109msgid "Name (controller/action)" 
     2110msgstr "Nimi (kontrolleri/toiminto)" 
     2111 
     2112#: app/controllers/action_key_controller.rb:26 
    20922113msgid "Create a new key" 
    20932114msgstr "Luo uusi avain" 
    20942115 
    2095 #: app/controllers/action_key_controller.rb:32 
     2116#: app/controllers/action_key_controller.rb:35 
    20962117msgid "Edit key" 
    20972118msgstr "Muokkaa avainta" 
    …… 
    24632484#: app/controllers/type_attachment_controller.rb:23 
    24642485#: app/views/attachment/view.rhtml:9 
    2465 #: app/views/task/print_view.rhtml:101 
     2486#: app/views/task/print_view.rhtml:75 
    24662487msgid "Asset type" 
    24672488msgstr "Kohdetyyppi" 
    …… 
    25132534msgstr "Muokkaa avainrengasta" 
    25142535 
    2515 #: app/controllers/keyring_controller.rb:69 
     2536#: app/controllers/keyring_controller.rb:68 
    25162537msgid "Keys in the keyring %s" 
    25172538msgstr "Avainrenkaan %s avaimet" 
    25182539 
    2519 #: app/controllers/keyring_controller.rb:71 
     2540#: app/controllers/keyring_controller.rb:70 
    25202541msgid "Key" 
    25212542msgstr "Avain" 
    …… 
    29052926 
    29062927#: app/views/task/_form.rhtml:45 
    2907 #: app/views/task/print_view.rhtml:44 
     2928#: app/views/task/print_view.rhtml:11 
    29082929#: app/views/task/create.rhtml:13 
    29092930msgid "Short description" 
    …… 
    29112932 
    29122933#: app/views/task/_form.rhtml:55 
    2913 #: app/views/task/print_view.rhtml:50 
     2934#: app/views/task/print_view.rhtml:17 
    29142935msgid "Created by" 
    29152936msgstr "Luonut" 
    29162937 
    29172938#: app/views/task/_form.rhtml:70 
    2918 #: app/views/task/print_view.rhtml:56 
     2939#: app/views/task/print_view.rhtml:23 
    29192940msgid "Responsible user" 
    29202941msgstr "Vastuussa oleva kÀyttÀjÀ" 
    29212942 
    29222943#: app/views/task/_form.rhtml:71 
    2923 #: app/views/task/print_view.rhtml:57 
     2944#: app/views/task/print_view.rhtml:24 
    29242945msgid "accepted" 
    29252946msgstr "hyvÀksytty" 
    29262947 
    29272948#: app/views/task/_form.rhtml:95 
    2928 #: app/views/task/print_view.rhtml:68 
     2949#: app/views/task/print_view.rhtml:35 
    29292950msgid "Initial working<br/>time estimate" 
    29302951msgstr "Alustava työaika-arvio" 
    29312952 
    29322953#: app/views/task/_form.rhtml:97 
    2933 #: app/views/task/print_view.rhtml:70 
     2954#: app/views/task/print_view.rhtml:37 
    29342955msgid "Spent working time" 
    29352956msgstr "KÀytetty työaika" 
    …… 
    29442965 
    29452966#: app/views/task/_form.rhtml:140 
     2967#: app/views/task/print_view.rhtml:42 
    29462968msgid "Assigned users" 
    29472969msgstr "MÀÀrÀtyt kÀyttÀjÀt" 
    …… 
    30033025 
    30043026#: app/views/task/view.rhtml:56 
    3005 #: app/views/task/print_view.rhtml:121 
     3027#: app/views/task/print_view.rhtml:95 
    30063028msgid "Change history" 
    30073029msgstr "Muutoshistoria" 
    …… 
    30123034 
    30133035#: app/views/task/view.rhtml:84 
     3036#: app/views/form/view.rhtml:45 
     3037#: app/views/customer_interface/view_form.rhtml:14 
    30143038msgid "Printer-friendly" 
    30153039msgstr "Tulostettava" 
    …… 
    30193043msgstr "%s asetettu vastuulliseksi kÀyttÀjÀn %s toimesta" 
    30203044 
    3021 #: app/views/task/print_view.rhtml:33 
    3022 msgid "Print" 
    3023 msgstr "Tulosta" 
    3024  
    3025 #: app/views/task/print_view.rhtml:82 
    3026 #: app/views/task/print_view.rhtml:122 
     3045#: app/views/task/print_view.rhtml:55 
     3046#: app/views/task/print_view.rhtml:96 
    30273047msgid "Show" 
    30283048msgstr "NÀytÀ" 
    30293049 
    3030 #: app/views/task/print_view.rhtml:82 
    3031 #: app/views/task/print_view.rhtml:122 
     3050#: app/views/task/print_view.rhtml:55 
     3051#: app/views/task/print_view.rhtml:96 
    30323052msgid "Hide" 
    30333053msgstr "Piilota" 
    …… 
    33053325msgstr "KÀÀnnÀ" 
    33063326 
    3307 #: app/views/shared/_list_items.rhtml:311 
    3308 #: app/views/shared/export_items_csv.rhtml:37 
    3309 #: app/views/customer_interface/_form_field_values.rhtml:14 
    3310 #: app/views/customer_interface/_item_list.rhtml:64 
    3311 msgid "No" 
    3312 msgstr "Ei" 
    3313  
    3314 #: app/views/shared/_list_items.rhtml:313 
    3315 #: app/views/shared/export_items_csv.rhtml:39 
    3316 #: app/views/form/remove.rhtml:5 
    3317 #: app/views/customer_interface/_form_field_values.rhtml:14 
    3318 #: app/views/customer_interface/_item_list.rhtml:66 
    3319 msgid "Yes" 
    3320 msgstr "KyllÀ" 
    3321  
    33223327#: app/views/shared/_list_items.rhtml:363 
    33233328msgid "Perform action on the selected items" 
    …… 
    34283433msgstr "%i uutta palvelupyyntöÀ vastaanotettu" 
    34293434 
     3435#: app/views/layouts/print.rhtml:13 
     3436msgid "Print" 
     3437msgstr "Tulosta" 
     3438 
    34303439#: app/views/layouts/customer_interface.rhtml:3 
    34313440msgid "NorfelloCMMS Customer Interface" 
    …… 
    34683477msgstr "Valmis" 
    34693478 
     3479#: app/views/form/_form_field_values.rhtml:10 
     3480msgid "View image" 
     3481msgstr "NÀytÀ kuva" 
     3482 
    34703483#: app/views/form