Changeset 750

Timestamp:

03/11/08 19:08:29 (10 months ago)

Author:

markku

Message:

Closes #433. Ordering of users respects the name option in all views.
There are 8 name format options and adding new ones takes only two simple lines of code.

Files:

• trunk/app/controllers/application.rb (modified) (1 diff)
• trunk/app/controllers/keyring_controller.rb (modified) (3 diffs)
• trunk/app/controllers/message_controller.rb (modified) (2 diffs)
• trunk/app/controllers/setting_controller.rb (modified) (1 diff)
• trunk/app/controllers/user_controller.rb (modified) (6 diffs)
• trunk/app/controllers/user_group_controller.rb (modified) (2 diffs)
• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/app/helpers/customer_interface_helper.rb (modified) (4 diffs)
• trunk/app/helpers/task_helper.rb (modified) (1 diff)
• trunk/app/models/asset.rb (modified) (2 diffs)
• trunk/app/models/customer.rb (modified) (1 diff)
• trunk/app/models/lockable.rb (modified) (1 diff)
• trunk/app/models/notification_mailer.rb (modified) (1 diff)
• trunk/app/models/setting.rb (modified) (9 diffs)
• trunk/app/models/task.rb (modified) (1 diff)
• trunk/app/models/user.rb (modified) (2 diffs)
• trunk/app/models/user_account.rb (modified) (1 diff)
• trunk/app/views/attachment/view.rhtml (modified) (1 diff)
• trunk/app/views/layouts/customer_interface.rhtml (modified) (1 diff)
• trunk/app/views/setting/access_control.rhtml (modified) (1 diff)
• trunk/app/views/task/_display_task_event.rhtml (modified) (1 diff)
• trunk/app/views/task/_form.rhtml (modified) (1 diff)
• trunk/app/views/task/print_view.rhtml (modified) (3 diffs)
• trunk/app/views/task/view.rhtml (modified) (3 diffs)
• trunk/app/views/timeline/_display_event.rhtml (modified) (3 diffs)
• trunk/doc/manual/latex/tex/configuration_section.tex (modified) (1 diff)
• trunk/po/fi_FI/norfello_cmms.po (modified) (22 diffs)
• trunk/test/functional/setting_controller_test.rb (modified) (3 diffs)
• trunk/test/test_helper.rb (modified) (1 diff)
• trunk/test/unit/notification_mailer_test.rb (modified) (2 diffs)
• trunk/test/unit/user_test.rb (modified) (2 diffs)

trunk/app/controllers/application.rb

@@ -666 +666 @@
-        sort_sql = (@fields.collect { |f| f[2] })[@sort_column]
-        if params[:sort_desc]
-+= ' DESC'
+= sort_sql.split(',').map { |col| col + ' DESC' }.join(',')
-          @sort_desc = 1
-        end

trunk/app/controllers/keyring_controller.rb

@@ -114 +114 @@
-    @keyring = Keyring.find params[:id], :readonly => true
-    @items_count = @keyring.users.count
-
+, :order => User.sql_order_for_login_and_name
-    @title = _('Owners of keyring %s', @keyring.name)
-    @fields = [ [_('Login and name'), :login_and_name] ]
@@ -120 +120 @@
-    @check_name = 'remove'
-    @post_params = { :action => 'remove_owners', :id => @keyring.id }
-) - @keyring.users).collect {|p| [ p.login_and_name, p.id ]}.sort { |a,b| a.first <=> b.first 
+, :order => User.sql_order_for_login_and_name) - @keyring.users).collect {|p| [ p.login_and_name, p.id ]
-    common_list(false)
-  end
@@ -137 +137 @@
-
-    info "Keyring #{keyring.name} given to user #{user.login}"
-login_and_
+
-  end
-

trunk/app/controllers/message_controller.rb

@@ -36 +36 @@
-  def view
-    @message = Message.find_for_current_user(params[:id])
-login_and_
+
-    @title = _('Message from %s', sender || 'CMMS')
-
@@ -53 +53 @@
-    else
-      @title = _('Send message')
-login_and_
+
-    end
-

trunk/app/controllers/setting_controller.rb

@@ -20 +20 @@
-    @title = _('Edit access control settings')
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if request.post?
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        flash[:notice] = msg_changes_saved
-        redirect_to(:back)  # flash will stay on without this

trunk/app/controllers/user_controller.rb

@@ -26 +26 @@
-    @title = _('User accounts')
-    @fields = [
-
-
+, User.sql_order
+, 'login'
-              ]
-    # Render form with 'Remove' check boxes if user is authorized
@@ -37 +37 @@
-      @actions = []
-    end
-'login'
+User.sql_order
-
-    common_list
@@ -45 +45 @@
-    @title = _('Create new user account')
-
-).collect {|u| [u.login_and_
+, :order => User.sql_order).collect {|u| [u.
-    @fields = [
-                [_('Username'), :text_field, 'login', { :size => 30, :maxlength => 40 } ],
@@ -151 +151 @@
-      names.push keyring.name
-    end
-login_and_
+
-  end
-
@@ -166 +166 @@
-      names.push user_group.name
-    end
-login_and_
+
-  end
-
@@ -301 +301 @@
-    end
-
-'login'
+User.sql_order
-    common_list(false)
-  end

trunk/app/controllers/user_group_controller.rb

@@ -97 +97 @@
-    if @add
-      if @items.empty?
-'login'
+User.sql_order_for_login_and_name
-      else
-        user_ids = @items.collect {|u| u.id }.join(',')
-'login'
+User.sql_order_for_login_and_name
-      end
-    end
@@ -118 +118 @@
-
-      info "User #{user.login} added to UserGroup #{user_group.name}"
-login_and_
+
-    end
-    redirect_to :back

trunk/app/helpers/application_helper.rb

@@ -502 +502 @@
-    return '' unless user
-
-login_and_
+
-    return link_to(h(link_text), {:controller => 'user', :action => 'view', :id => user.id}, :class => 'user')
-login_and_
+
-    #link = "<a href=\"/user/view/#{user.id}\" class=\"user\">#{link_title}</a>"
-    return link

trunk/app/helpers/customer_interface_helper.rb

@@ -141 +141 @@
-    case event.event_type
-      when FormEvent.TYPES[:CREATED]
-login_and_
+
-      when FormEvent.TYPES[:MODIFIED]
-login_and_
+
-    end
-    return result
@@ -164 +164 @@
-    case event.event_type
-      when TaskEvent.TYPES[:CREATED]
-login_and_
+
-      when TaskEvent.TYPES[:CLOSED]
-login_and_
+
-      when TaskEvent.TYPES[:ASSIGNED]
-login_and_name : _('Unknown'),  event.creator ? event.creator.login_and_
+name : _('Unknown'),  event.creator ? event.creator.
-      when TaskEvent.TYPES[:ACCEPTED]
-login_and_
+
-      when TaskEvent.TYPES[:REOPENED]
-login_and_
+
-      when TaskEvent.TYPES[:COMMENTED]
-login_and_
+
-    end
-    return result
@@ -193 +193 @@
-    result = format_attachment(event.attachment, false)
-    result += '<br/>'
-login_and_
+
-    return result
-  end
@@ -225 +225 @@
-    result = format_date(event.created_at, _('%Y-%m-%d'), _('%H:%M'), '<span class="date">%s</span>&nbsp;<span class="time">%s</span>')
-    result += '<br/>'
-login_and_
+
-    return result
-  end

trunk/app/helpers/task_helper.rb

@@ -45 +45 @@
-      end
-
-login_and_
+
-
-      if show_buttons

trunk/app/models/asset.rb

@@ -74 +74 @@
-  def Asset.get_first_authorized_to_read
-    first = Asset.find_authorized_to_read(:first, :order => 'id')
-#{UserAccount.current_user.login_and_name}
+'#{UserAccount.current_user.login}'
-    return first
-  end
@@ -276 +276 @@
-      sql[0] += 'users.type = ? AND users.id = user_groups_users.user_id AND user_groups_users.user_group_id IN (?)'
-      sql.push('User', self.user_groups.map {|g| g.id })
-') ORDER BY id'
+") ORDER BY #{User.sql_order}"
-
-      User.find_by_sql(sql)
-    else
-'id'
+User.sql_order
-      options[:conditions] = ['id != ?', exclude_user_id] if exclude_user_id.is_a?(Integer)
-      User.find(:all, options)

trunk/app/models/customer.rb

@@ -46 +46 @@
-  end
-
+  # Method: User.sql_order
+  # ======================
+  # Returns:
+  # --------
+  # The customer ordering SQL clause.
+  #
+  def User.sql_order
+    'full_name'
+  end
+
-  # Method: asset_count
-  # ===================

trunk/app/models/lockable.rb

@@ -35 +35 @@
-    return false unless self.is_open_for_current_user
-
-#{UserAccount.current_user.login_and_name}
+'#{UserAccount.current_user.login}'
-    self.lock_user = UserAccount.current_user
-    self.lock_timeout = duration.from_now

trunk/app/models/notification_mailer.rb

@@ -113 +113 @@
-    message = localize("Task {%i} (%s) - %s\n\n%s\n\nAsset: %s (%s)\n", task.id, task.task_type.name, task_url, task.short_description, asset.full_code, asset.name)
-    message += localize("Asset type: %s\n", asset.asset_type.name) if asset.asset_type
-login_and_
+
-
-    recipients recipient

trunk/app/models/setting.rb

@@ -5 +5 @@
-# ===============
-# Model that is used to save and load system settings.
-has
+and
-#
-# Attributes:
-# -----------
-# name            - Name of the setting
-
+a 
-# value_is_string - Tells whether the setting value is string or not.
-#
@@ -19 +19 @@
-# Note:
-# -----
-are
+is
-# and modify the set_value and get_value instance methods.
-#
@@ -35 +35 @@
-  # Constant: VALUE_TO_STRING
-  # =========================
-
+discreate 
-  # All setting values are saved as strings.
-
+representative 
-  #
-  VALUE_TO_STRING = {
@@ -55 +55 @@
-  #
-  NAMES = [
-
+
+
-          ]
-
-  # Constant: DEFAULT_VALUES
-  # ========================
-settings in <NAMES> - in the same order
+the settings in <NAMES> (in the same order)
-  #
-  DEFAULT_VALUES = [
-
+
+
-                   ]
-
@@ -71 +73 @@
-  # Method: Setting.load_settings
-  # =============================
-
+
+
-  #
-  def Setting.load_settings
@@ -77 +80 @@
-      class_variable_set('@@' + name, self.get(name))
-    }
+    return # nil
-  end
-
@@ -95 +99 @@
-  # value - Value for the setting
-  #
+  # Returns:
+  # --------
+  # Returns true if the setting is succesfully saved.
+  # Otherwise returns false.
+  #
-  def Setting.set(name, value)
-    name = name.to_s
@@ -107 +116 @@
-    setting.set_value(value)
-
-
-
+
+
+
+
+
-  end
-
@@ -127 +139 @@
-    return nil unless NAMES.include?(name)
-
- never
+n't usually
-    # If one nevertheless doesn't the model recreates the default setting.
+    # This means that new settings are automatically set to their default
+    # values when they are requested for the first time.
-    Setting.set(name, DEFAULT_VALUES[NAMES.index(name)])
-    return Setting.get(name)

trunk/app/models/task.rb

@@ -267 +267 @@
-    for creation_date, creator, text in comments
-      text ||= ''
-login_and_
+
-    end
-    return result.join('  |  ')

trunk/app/models/user.rb

@@ -32 +32 @@
-  end
-
+  # Constant: NAME_FORMATS
+  # ======================
+  # Holds the available name formats in the following format:
+  # {
+  #  format_ID => ['name format', [:name_method, ...], SQL_order_by]
+  # }
+  #
+  NAME_FORMATS = {
+    '1' => ['%s, %s', [:last_name, :first_name], 'last_name,first_name'],
+    '2' => ['%s %s', [:first_name, :last_name], 'first_name,last_name'],
+    '3' => ['%s, %s (%s)', [:last_name, :first_name, :login], 'last_name,first_name,login'],
+    '4' => ['%s %s (%s)', [:first_name, :last_name, :login], 'first_name,last_name,login'],
+    '5' => ['%s (%s, %s)', [:login, :last_name, :first_name], 'login,last_name,first_name'],
+    '6' => ['%s (%s %s)', [:login, :first_name, :last_name], 'login,first_name,last_name'],
+    '7' => ['%s', [:first_name], 'first_name'],
+    '8' => ['%s (%s)', [:first_name, :login], 'first_name,login'],
+  }
+
+  # Method: User.current_name_format
+  # ================================
+  # The current name format specified by the Setting.user_name_format setting
+  # and the corresponding format in NAME_FORMATS.
+  #
+  def User.current_name_format
+    NAME_FORMATS[Setting.user_name_format]
+  end
+
-  # Method: name
-  # ============
-
-
+
+
+
+
+
+
-  def name
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -130 +178 @@
-    return self
-  end
+
+protected
+
+  # Method: name
+  # ============
+  # The name of the user in the given name format. When called without
+  # the format parameter, returns the name string in the format
+  # specified by the current name format setting.
+  #
+  # Parameters:
+  # -----------
+  # format_id - The name format that is used.
+  #             If nil the current name format setting is used.
+  #
+  # Retuns:
+  # -------
+  # Formatted name string
+  #
+  # Note:
+  # -----
+  # We can't use this method directly as the <name> method because it is
+  # an automatic field (<name> would be called with a wrong parameter).
+  #
+  def _name(format = nil)
+    format ||= User.current_name_format
+    return format.first % format[1].map { |m| self.send(m) }
+  end
-end

trunk/app/models/user_account.rb

@@ -91 +91 @@
-  end
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  end
-

trunk/app/views/attachment/view.rhtml

@@ -31 +31 @@
-  <tr>
-    <th><%= _('Creator') %></th>
-login_and_
+
-  </tr>
-  <tr>

trunk/app/views/layouts/customer_interface.rhtml

@@ -48 +48 @@
-
-  <div id="loginstatus">
-session[:user].login_and_name), {:action => 'edit_my_information'}, {:id => 'login_name', :title => _('My information')}) : "<span id=\"login_name\">#{h(session[:user].login_and_name
+"#{session[:user].login} (#{session[:user].name})"), {:action => 'edit_my_information'}, {:id => 'login_name', :title => _('My information')}) : "<span id=\"login_name\">#{h(session[:user].login
-    <div id="logbutton"><%= link_to( image_tag('customer_interface/logout.jpg'), {:controller => 'user', :action => 'logout'} ) %></div>
-  </div>

trunk/app/views/setting/access_control.rhtml

@@ -1 +1 @@
-<%= form_tag() %>
-  <table class="form">
-
-
+
+
+
+
+
+
+
+
-  </table>
-  <%= buttons_table(_('Save changes'), {:action => 'access_control'}) %>

trunk/app/views/task/_display_task_event.rhtml

@@ -4 +4 @@
-    <% case event.event_type
-      when TaskEvent.TYPES[:CREATED] -%>
-login_and_
+
-      <% when TaskEvent.TYPES[:CLOSED] -%>
-login_and_
+
-      <% when TaskEvent.TYPES[:ASSIGNED] -%>
-login_and_name : _('Unknown'),  event.creator ? event.creator.login_and_
+name : _('Unknown'),  event.creator ? event.creator.
-      <% when TaskEvent.TYPES[:ACCEPTED] -%>
-login_and_
+
-      <% when TaskEvent.TYPES[:REOPENED] -%>
-login_and_
+
-      <% when TaskEvent.TYPES[:COMMENTED] -%>
-login_and_
+
-    <% end -%>
-  </th>

trunk/app/views/task/_form.rhtml

@@ -55 +55 @@
-    <tr>
-      <th><%= _('Created by') %></th>
-login_and_
+
-    </tr>
-    <tr>

trunk/app/views/task/print_view.rhtml

@@ -16 +16 @@
-  <tr>
-    <th class="first"><%= _('Created by') %></th>
-login_and_
+
-    <th class="second"><%= _('Created at') %></th>
-    <td><%= h(format_date(@task.created_at)) %></td>
@@ -22 +22 @@
-  <tr>
-    <th class="first"><%= _('Responsible user') %></th>
-login_and_
+
-    <th class="second"><%= _('Starting time') %></th>
-    <td><%= h(format_date(@task.starting_time)) if @task.starting_time %>
@@ -41 +41 @@
-  <tr>
-    <th class="first"><%= _('Assigned users') %></th>
-login_and_
+
-  </tr>
-  <% end -%>

trunk/app/views/task/view.rhtml

@@ -21 +21 @@
-        <% end -%>
-        <%= radio_button_tag('task_action', 'assign') %><%= _('Assign responsibility to') %>:
-login_and_
+
-      <% when Task.ASSIGNED -%>
-        <%= radio_button_tag('task_action', 'leave', true) %><%= _('Leave as assigned') %><br/>
@@ -31 +31 @@
-        <% end -%>
-        <%= radio_button_tag('task_action', 'assign') %><%= _('Reassign responsibility to') %>:
-login_and_
+
-      <% when Task.ACCEPTED -%>
-        <%= radio_button_tag('task_action', 'leave', true) %><%= _('Leave as accepted') %><br/>
@@ -40 +40 @@
-        <% end -%>
-        <%= radio_button_tag('task_action', 'assign') %><%= _('Reassign responsibility to') %>:
-login_and_
+
-      <% when Task.CLOSED -%>
-        <%= radio_button_tag('task_action', 'leave', true) %><%= _('Leave as closed') %><br/>

trunk/app/views/timeline/_display_event.rhtml

@@ -12 +12 @@
-      case event.event_type
-        when TaskEvent.TYPES[:CREATED]
-login_and_
+
-        when TaskEvent.TYPES[:CLOSED]
-login_and_
+
-        when TaskEvent.TYPES[:ASSIGNED]
-login_and_name : _('Unknown'),  event.creator ? event.creator.login_and_
+name : _('Unknown'),  event.creator ? event.creator.
-        when TaskEvent.TYPES[:ACCEPTED]
-login_and_
+
-        when TaskEvent.TYPES[:REOPENED]
-login_and_
+
-        when TaskEvent.TYPES[:COMMENTED]
-login_and_
+
-      end
-      -%>
@@ -35 +35 @@
-      case event.event_type
-        when FormEvent.TYPES[:CREATED]
-login_and_
+
-        when FormEvent.TYPES[:MODIFIED]
-login_and_
+
-      end
-      -%>
@@ -50 +50 @@
-      case event.event_type
-      when AttachmentEvent.TYPES[:CREATED]
-login_and_
+
-      end
-      -%>

trunk/doc/manual/latex/tex/configuration_section.tex

@@ -245 +245 @@
-The 'Enable the user permission system for assets' setting enables you to choose whether you want to use the user permission system or not. By default the user permission system is disabled. If the level of access control provided by the keys and keyrings is sufficient for you, we recommend you to leave the user permission system disabled. If you need user specific user rights for assets and their data, you  can enable the user permission system. In this case see the sub-section~\ref{subsec:user_groups} for more information.
-
+The 'Name format for users' setting enables you to choose the display format for the names of users. The default format is 'Last name, First name', but you can select the name format from several possibilities.
+
-\subsection{User groups}
-\label{subsec:user_groups}

trunk/po/fi_FI/norfello_cmms.po

@@ -2 +2 @@
-msgstr ""
-"Project-Id-Version: NorfelloCMMS SVN trunk\n"
-2-21 13:57
-2-21 13:59
+3-11 18:36
+3-11 19:03
-"Last-Translator: Markku Oksanen <markku.oksanen@norfello.com>\n"
-"Language-Team: Norfello Ltd. <contact@norfello.com>\n"
@@ -293 +293 @@
-msgstr[1] "%d avainta"
-
-30
+44
-msgid "Text file"
-msgstr "Tekstitiedosto"
-
-32
+46
-msgid "Image file"
-msgstr "Kuvatiedosto"
-
-34
+48
-msgid "PDF file"
-msgstr "PDF-tiedosto"
-
-36
+50
-msgid "gzip (GNU zip) file"
-msgstr "gzip (GNU zip) -tiedosto"
-
-38
+52
-#: app/helpers/customer_interface_helper.rb:143
-#: app/helpers/customer_interface_helper.rb:145
@@ -695 +695 @@
-#: app/helpers/application_helper.rb:470
-#: app/controllers/attachment_controller.rb:22
-6
+5
-#: app/controllers/type_attachment_controller.rb:19
-msgid "Attachment"
@@ -916 +916 @@
-
-#: app/helpers/application_helper.rb:844
-3
+5
-#: app/views/shared/export_items_csv.rhtml:39
-#: app/views/form/remove.rhtml:5
@@ -924 +924 @@
-
-#: app/helpers/application_helper.rb:844
-1
+3
-#: app/views/shared/export_items_csv.rhtml:37
-#: app/views/customer_interface/_item_list.rhtml:64
@@ -970 +970 @@
-#: app/controllers/data_permission_controller.rb:56
-#: app/controllers/task_controller.rb:481
-8
+7
-#: app/controllers/asset_tree_controller.rb:125
-91
+86
-msgid "read"
-msgstr "lue"
@@ -1123 +1123 @@
-#: app/controllers/form_controller.rb:438
-#: app/controllers/task_controller.rb:308
-8
-20
+7
+15
-msgid "remove"
-msgstr "poista"
@@ -1290 +1290 @@
-msgstr "Muokkaa oikeuksienhallinnan asetuksia"
-
+#: app/controllers/setting_controller.rb:28
+msgid "Last name, First name"
+msgstr "Sukunimi, Etunimi"
+
+#: app/controllers/setting_controller.rb:29
+msgid "First name Last name"
+msgstr "Etunimi Sukunimi"
+
+#: app/controllers/setting_controller.rb:30
+msgid "Last name, First name (Username)"
+msgstr "Sukunimi, Etunimi (KÀyttÀjÀtunnus)"