Changeset 713

Timestamp:

11/02/07 12:21:04 (1 year ago)

Author:

markku

Message:

Closes #479

Files:

• trunk/app/controllers/customer_controller.rb (modified) (1 diff)
• trunk/app/controllers/customer_interface_controller.rb (modified) (1 diff)
• trunk/app/models/customer.rb (modified) (1 diff)
• trunk/app/models/notification_mailer.rb (modified) (2 diffs)
• trunk/app/models/user.rb (modified) (1 diff)
• trunk/app/models/user_account.rb (modified) (3 diffs)
• trunk/app/views/customer/_create.rhtml (added)
• trunk/app/views/customer_interface/comment_service_request.rhtml (added)
• trunk/app/views/notification_mailer/customer_created_notification.rhtml (added)
• trunk/doc/manual/latex/tex/configuration_section.tex (modified) (1 diff)
• trunk/po/fi_FI/norfello_cmms.po (modified) (42 diffs)
• trunk/public/javascripts/application.js (modified) (2 diffs)
• trunk/test/functional/customer_controller_test.rb (modified) (3 diffs)
• trunk/test/functional/customer_interface_controller_test.rb (modified) (3 diffs)
• trunk/test/unit/notification_mailer_test.rb (modified) (2 diffs)
• trunk/test/unit/user_account_test.rb (modified) (2 diffs)

trunk/app/controllers/customer_controller.rb

@@ -49 +49 @@
-               [_('Name'), :text_field, 'name', { :size => 30, :maxlength => 40 } ],
-               [_('Description'), :text_field, 'description', { :size => 30, :maxlength => 60 } ],
-
+, :onchange => 'disable_notify_new_user()'
-               [_('Phone number'), :text_field, 'phone', { :size => 30, :maxlength => 20 } ],
-               [_('City'), :text_field, 'city', { :size => 30, :maxlength => 40 } ],
-               [_('Country'), :text_field, 'country', { :size => 30, :maxlength => 40 } ],
-
+
+
-              ]
-
-
+, 'create'
-  end
-

trunk/app/controllers/customer_interface_controller.rb

@@ -247 +247 @@
-  #
-  def comment_service_request
-, :conditions => ['state != ?', Task.CLOSED]
+
-    @title = _('Comment service request %s', @task.to_s)
-
-
+ and @task.state != Task.CLOSED
-      flash[:error] = _('Service request %s not found!', @task.to_s)
-      redirect_to(:action => 'index')

trunk/app/models/customer.rb

@@ -13 +13 @@
-  belongs_to :service_request_type, :class_name => 'TaskType', :foreign_key => 'service_request_type_id'
-  has_many :assets
+
+  event :created, :dispatch_after => :create
-
-  # Set the name as an alias for the full_name attribute:

trunk/app/models/notification_mailer.rb

@@ -12 +12 @@
-  # Functions that the ModelObserver runs when corresponding events
-  # for tasks take place
+
+  def self.customer_created(customer)
+    return unless customer.instance_of?(Customer) and customer.notify_new_user and customer.email and customer.email != ''
+    deliver_customer_created_notification(customer)
+  end
-
-  def self.task_created(task)
@@ -105 +110 @@
-  end
-
+  # Method: customer_created_notification
+  # =====================================
+  # Sends an email notification to a new customer.
+  #
+  # Parameter:
+  # ---------
+  # customer - A <Customer> to whom the email is sent
+  #
+  def customer_created_notification(customer)
+    url = url_for(:host => ApplicationController.host, :controller => 'user', :action => 'login')
+
+    recipients "#{customer.name} <#{customer.email}>"
+    subject    localize('NorfelloCMMS - Customer account')
+    from       NotificationMailer.email_sender
+    sent_on    Time.now
+    body       :message => localize("Welcome to using NorfelloCMMS Customer interface.\nYou can login at %s.\n\nYour user account details are:\nUsername: %s\nPassword: %s\nEmail: %s\n\nWe recommend you to change the password when you login for the first time.", url, customer.login, customer.plain_password, customer.email), :automatic_message => localize("This is an automatic email notification from the NorfelloCMMS OS\nrunning at %s.", ApplicationController.host)
+
+    NotificationMailer._info("Mail generated for new customer '#{customer.login}'")
+  end
+
-  private
-  def localize(msg, *args)

trunk/app/models/user.rb

@@ -3 +3 @@
-
-class User < UserAccount
-
-  # this name is NOT used by this model
+ (these fields are NOT used by this model)
+, :notify_new_user
-  # Validation
-  validates_presence_of :first_name, :last_name

trunk/app/models/user_account.rb

@@ -31 +31 @@
-  validates_length_of :city, :maximum => 40
-  # Callbacks
+  before_create :save_plain_password
-  before_create :crypt_password
-  before_validation_on_update :conserve_password_if_nil
@@ -44 +45 @@
-
-  cattr_accessor :current_user
+
+  # Plain (i.e. not encrypted) password can be read after creation if
+  # the notify_new_user attribute is set to true. Practise extra caution
+  # when using the plain_password attribute.
+  attr_reader :notify_new_user
+  attr_reader :plain_password
+
+  # Method: notify_new_user
+  # =======================
+  # Sets the notify_new_user attribute.
+  #
+  def notify_new_user=(value)
+    if value == '1' or value == true
+      @notify_new_user = true
+    end
+  end
-
-  # Updates accessed_at timestamp for +user+, without updating updated_at timestamp.
@@ -196 +213 @@
-    end
-  end
+
+  # Method: save_plain_password
+  # ===========================
+  # Saves the password for later use if the notify_new_user attribute is true.
+  #
+  def save_plain_password
+    @plain_password = self.password if @notify_new_user
+    true
+  end
-end

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

@@ -317 +317 @@
-You can edit a customer by using the 'Edit' action in 'Actions' column of the customer list. This action can also be used to view all information for a customer and to reset the password.
-\paragraph{Create}
-
+ By choosing the 'Send email notification' option you can automatically email the customer account information to a new customer --- you'll have to fill the 'Email address' field for this to work.
-\paragraph{Select service request type}
-The \emph{service request type} is the task type that is used when a customer submits a service request through the 'Customer interface'. By using this action you can select a task type that is used to store the service requests.  The default database shipped with NorfelloCMMS OS contains an example service request type named 'Service request from a customer' which you can edit to match your needs in the 'Task types' menu.

trunk/po/fi_FI/norfello_cmms.po

@@ -2 +2 @@
-msgstr ""
-"Project-Id-Version: NorfelloCMMS SVN trunk\n"
-0-18 13:52+03
-0-18 14:05
+1-02 11:48+02
+1-02 12:12
-"Last-Translator: Markku Oksanen <markku.oksanen@norfello.com>\n"
-"Language-Team: Norfello Ltd. <contact@norfello.com>\n"
@@ -34 +34 @@
-msgstr "ei saa olla aikaisempi kuin aloitusaika"
-
-37
+50
-msgid "Task was assigned to you"
-msgstr "Sinulle annettiin tehtÀvÀ"
@@ -113 +113 @@
-
-#: app/models/form_field.rb:41
-4
+6
-#: app/controllers/asset_field_controller.rb:113
-msgid "Time"
@@ -291 +291 @@
-
-#: app/models/attachment_methods.rb:38
-09
-11
-32
-34
-36
-38
-40
-42
-61
-0
+41
+43
+64
+66
+68
+70
+72
+74
+93
+1
-#: app/views/task/_display_task_event.rhtml:6
-#: app/views/task/_display_task_event.rhtml:8
@@ -653 +653 @@
-msgstr "cmmspohja"
-
-43
+71
-#: app/helpers/application_helper.rb:428
-#: app/controllers/form_controller.rb:461
@@ -659 +659 @@
-msgstr "Lomake"
-
-64
+96
-#: app/helpers/application_helper.rb:451
-msgid "Task"
-msgstr "TehtÀvÀ"
-
-
+
+
+
+
+
+
-#: app/helpers/application_helper.rb:470
-#: app/controllers/attachment_controller.rb:22
@@ -672 +677 @@
-msgstr "Liitetiedosto"
-
-09
+41
-#: app/views/timeline/_display_event.rhtml:37
-msgid "Filled out by %s"
-msgstr "TÀytetty kÀyttÀjÀn %s toimesta"
-
-11
+43
-#: app/views/timeline/_display_event.rhtml:39
-msgid "Modified by %s"
-msgstr "Muokattu kÀyttÀjÀn %s toimesta"
-
-32
+64
-#: app/views/task/_display_task_event.rhtml:6
-#: app/views/timeline/_display_event.rhtml:14
@@ -688 +693 @@
-msgstr "Luotu kÀyttÀjÀn %s toimesta"
-
-34
+66
-#: app/views/task/_display_task_event.rhtml:8
-#: app/views/timeline/_display_event.rhtml:16
@@ -694 +699 @@
-msgstr "Suljettu kÀyttÀjÀn %s toimesta"
-
-36
+68
-#: app/views/timeline/_display_event.rhtml:18
-msgid "Assigned to %s by %s"
-msgstr "%s asetettu vastuulliseksi kÀyttÀjÀn %s toimesta"
-
-38
+70
-#: app/views/task/_display_task_event.rhtml:12
-#: app/views/timeline/_display_event.rhtml:20
@@ -705 +710 @@
-msgstr "HyvÀksytty kÀyttÀjÀn %s toimesta"
-
-40
+72
-#: app/views/task/_display_task_event.rhtml:14
-#: app/views/timeline/_display_event.rhtml:22
@@ -711 +716 @@
-msgstr "Avattu uudestaan kÀyttÀjÀn %s toimesta"
-
-42
+74
-#: app/views/task/_display_task_event.rhtml:16
-#: app/views/timeline/_display_event.rhtml:24
@@ -717 +722 @@
-msgstr "Kommentti lisÀtty kÀyttÀjÀn %s toimesta"
-
-61
+93
-#: app/views/timeline/_display_event.rhtml:52
-msgid "Uploaded by %s"
-msgstr "Tallennettu kÀyttÀjÀn %s toimesta"
-
-173
+205
-#: app/controllers/task_controller.rb:452
-#: app/controllers/overview_controller.rb:59
@@ -728 +733 @@
-msgstr "Uusi"
-
-175
+207
-#: app/controllers/task_controller.rb:452
-#: app/controllers/overview_controller.rb:59
@@ -735 +740 @@
-msgstr "Osoitettu työntekijÀlle"
-
-177
+209
-#: app/controllers/task_controller.rb:452
-#: app/controllers/overview_controller.rb:59
@@ -742 +747 @@
-msgstr "HyvÀksytty"
-
-179
+211
-#: app/controllers/task_controller.rb:452
-#: app/controllers/overview_controller.rb:65
@@ -748 +753 @@
-msgstr "Suljettu"
-
-191
-48
+223
+50
-#: lib/localization.rb:17
-msgid "%Y-%m-%d"
-msgstr "%d.%m.%Y"
-
-191
-48
+223
+50
-msgid "%H:%M"
-msgstr "%H:%M"
-
-193
+225
-msgid "by %s"
-msgstr "%s toimesta"
@@ -927 +932 @@
-
-#: app/controllers/asset_controller.rb:61
-5
-3
+7
+4
-#: app/controllers/form_controller.rb:460
-#: app/controllers/task_controller.rb:42
@@ -939 +944 @@
-#: app/views/task/_form.rhtml:51
-#: app/views/form/view.rhtml:13
+#: app/views/customer_interface/comment_service_request.rhtml:4
-#: app/views/notification_mailer/task_notification.rhtml:5
-#: config/menu.rb:56
@@ -950 +956 @@
-#: app/controllers/task_type_controller.rb:36
-#: app/controllers/task_type_controller.rb:51
+#: app/controllers/customer_interface_controller.rb:210
-#: app/controllers/user_group_controller.rb:21
-#: app/controllers/user_group_controller.rb:39
@@ -959 +966 @@
-#: app/controllers/customer_controller.rb:27
-#: app/controllers/customer_controller.rb:49
-0
+1
-#: app/controllers/action_key_controller.rb:24
-#: app/controllers/action_key_controller.rb:33
@@ -1040 +1047 @@
-#: app/controllers/task_type_controller.rb:37
-#: app/controllers/task_type_controller.rb:52
-4
+5
-#: app/controllers/asset_type_controller.rb:45
-#: app/controllers/asset_type_controller.rb:55
@@ -1046 +1053 @@
-#: app/controllers/task_controller.rb:398
-#: app/controllers/customer_controller.rb:50
-1
+2
-#: app/controllers/user_controller.rb:99
-#: app/controllers/user_controller.rb:111
@@ -1224 +1231 @@
-msgstr "YhtÀÀn tehtÀvÀpohjaa ei ole tallennettu palvelimelle."
-
-6
+8
-msgid "Action"
-msgstr "Tapahtuma"
-
-08
+10
-#: app/controllers/message_controller.rb:21
-#: app/views/message/send_message.rhtml:21
@@ -1235 +1242 @@
-msgstr "Aihe"
-
-09
+11
-msgid "Status"
-msgstr "Tila"
-
-0
+2
-msgid "Last updated"
-msgstr "Muokattu"
-
-6
-7
+8
+8
-msgid "Submit service request"
-msgstr "LÀhetÀ palvelupyyntö"
-
-2
+3
-msgid "Summary"
-msgstr "Yhteenveto"
-
-5
+6
-msgid "Service request %s successfully received"
-msgstr "Palvelupyyntö %s vastaanotettu"
-
-89
+90
-msgid "Submitting"
-msgstr "LÀhetys"
+
+#: app/controllers/customer_interface_controller.rb:198
+#: app/views/customer_interface/comment_service_request.rhtml:15
+msgid "Submit"
+msgstr "LÀhetÀ"
+
+#: app/controllers/customer_interface_controller.rb:206
+#: app/controllers/user_controller.rb:313
+#: app/views/layouts/customer_interface.rhtml:50
+#: config/menu.rb:15
+msgid "My information"
+msgstr "Omat tiedot"
+
+#: app/controllers/customer_interface_controller.rb:211
+#: app/controllers/customer_controller.rb:28
+#: app/controllers/customer_controller.rb:46
+#: app/controllers/user_controller.rb:28
+#: app/controllers/user_controller.rb:48
+#: app/controllers/user_controller.rb:280
+#: app/controllers/user_controller.rb:317
+#: app/views/user/view.rhtml:6
+#: app/views/user/search.rhtml:4
+#: app/views/user/login.rhtml:34
+msgid "Username"
+msgstr "KÀyttÀjÀnimi"
+
+#: app/controllers/customer_interface_controller.rb:212
+#: app/controllers/customer_controller.rb:51
+#: app/controllers/customer_controller.rb:73
+#: app/controllers/user_controller.rb:54
+#: app/controllers/user_controller.rb:86
+#: app/controllers/user_controller.rb:319
+#: app/views/user/view.rhtml:18
+msgid "Email address"
+msgstr "SÀhköpostiosoite"
+
+#: app/controllers/customer_interface_controller.rb:213
+#: app/controllers/customer_controller.rb:52
+#: app/controllers/customer_controller.rb:74
+#: app/controllers/user_controller.rb:55
+#: app/controllers/user_controller.rb:87
+#: app/controllers/user_controller.rb:320
+#: app/views/user/view.rhtml:22
+msgid "Phone number"
+msgstr "Puhelinnumero"
+
+#: app/controllers/customer_interface_controller.rb:214
+#: app/controllers/customer_controller.rb:53
+#: app/controllers/customer_controller.rb:75
+#: app/controllers/user_controller.rb:57
+#: app/controllers/user_controller.rb:89
+#: app/controllers/user_controller.rb:322
+#: app/views/user/view.rhtml:30
+msgid "City"
+msgstr "Kaupunki"
+
+#: app/controllers/customer_interface_controller.rb:215
+#: app/controllers/customer_controller.rb:54
+#: app/controllers/customer_controller.rb:76
+#: app/controllers/user_controller.rb:58
+#: app/controllers/user_controller.rb:90
+#: app/controllers/user_controller.rb:323
+#: app/views/user/view.rhtml:34
+msgid "Country"
+msgstr "Maa"
+
+#: app/controllers/customer_interface_controller.rb:216
+#: app/controllers/customer_controller.rb:55
+#: app/controllers/customer_controller.rb:77
+#: app/controllers/user_controller.rb:93
+#: app/controllers/user_controller.rb:326
+msgid "Language"
+msgstr "Kieli"
+
+#: app/controllers/customer_interface_controller.rb:228
+#: app/controllers/user_controller.rb:343
+msgid "Your information has been updated"
+msgstr "Tiedot pÀivitetty"
+
+#: app/controllers/customer_interface_controller.rb:231
+#: app/controllers/user_controller.rb:345
+msgid "Unable to update your information"
+msgstr "Tietojen pÀivittÀminen epÀonnistui"
+
+#: app/controllers/customer_interface_controller.rb:253
+msgid "Service request %s not found!"
+msgstr "PalvelupyyntöÀ %s ei löydy!"
+
+#: app/controllers/customer_interface_controller.rb:261
+msgid "Comment successfully received"
+msgstr "Kommentti vastaanotettu"
+
+#: app/controllers/customer_interface_controller.rb:267
+msgid "Comment can't be empty. Please provide one."
+msgstr "Kommentti ei voi olla tyhjÀ. Ole hyvÀ ja tÀytÀ se."
-
-#: app/controllers/application.rb:53
@@ -1295 +1397 @@
-msgstr "Salasana vaihdettu"
-
-7
+8
-msgid "Unable to reset password"
-msgstr "Salasanan vaihtaminen epÀonnistui"
+
+#: app/controllers/application.rb:459
+#: app/views/customer_interface/_edit_my_information.rhtml:1
+#: app/views/customer_interface/edit_my_information.rhtml:1
+#: config/menu.rb:16
+msgid "Change password"
+msgstr "Vaihda salasana"
+
+#: app/controllers/application.rb:467
+msgid "Your password has been changed"
+msgstr "Salasana vaihdettu"
+
+#: app/controllers/application.rb:471
+msgid "Unable to change your password"
+msgstr "Salasanan vaihtaminen epÀonnistui"
+
+#: app/controllers/application.rb:474
+msgid "Invalid password"
+msgstr "VÀÀrÀ salasana"
-
-#: app/controllers/data_permission_controller.rb:25
@@ -1696 +1817 @@
-
-#: app/controllers/task_controller.rb:215
-8
+9
-msgid "No task types defined."
-msgstr "YhtÀÀn tehtÀvÀtyyppiÀ ei ole mÀÀritelty."
@@ -1830 +1951 @@
-msgstr "Asiakkaat"
-
-#: app/controllers/customer_controller.rb:28
-#: app/controllers/customer_controller.rb:46
-#: app/controllers/user_controller.rb:28
-#: app/controllers/user_controller.rb:48
-#: app/controllers/user_controller.rb:280
-#: app/controllers/user_controller.rb:317
-#: app/views/user/view.rhtml:6
-#: app/views/user/search.rhtml:4
-#: app/views/user/login.rhtml:34
-msgid "Username"
-msgstr "KÀyttÀjÀnimi"
-
-#: app/controllers/customer_controller.rb:29
-msgid "Assets"
@@ -1861 +1970 @@
-msgstr "Varmista salasana"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-msgid "Edit customer: %s"
-msgstr "Muokkaa asiakasta: %s"
-
-8
+9
-msgid "Customer information"
-msgstr "Asiakkaan tiedot"
-
-2
+3
-msgid "Select a type for service requests"
-msgstr "Valitse palvelupyyntöjen tyyppi"
@@ -2142 +2212 @@
-msgstr "KÀyttÀjÀn %s tiedot"
-
-#: app/controllers/user_controller.rb:313
-#: config/menu.rb:15
-msgid "My information"
-msgstr "Omat tiedot"
-
-#: app/controllers/user_controller.rb:324
-msgid "Send notification when I'm assigned to task as responsible user"
@@ -2154 +2219 @@
-msgid "Send notification when I'm assigned to task as worker"
-msgstr "LÀhteÀ ilmoitus kun minut mÀrÀtÀÀn työntekijÀksi tehtÀvÀÀn"
-
-#: app/controllers/user_controller.rb:343
-msgid "Your information has been updated"
-msgstr "Tiedot pÀivitetty"
-
-#: app/controllers/user_controller.rb:345
-msgid "Unable to update your information"
-msgstr "Tietojen pÀivittÀminen epÀonnistui"
-
-#: app/controllers/user_controller.rb:354
-#: config/menu.rb:16
-msgid "Change password"
-msgstr "Vaihda salasana"
-
-#: app/controllers/user_controller.rb:362
-msgid "Your password has been changed"
-msgstr "Salasana vaihdettu"
-
-#: app/controllers/user_controller.rb:365
-msgid "Unable to change your password"
-msgstr "Salasanan vaihtaminen epÀonnistui"
-
-#: app/controllers/user_controller.rb:368
-msgid "Invalid password"
-msgstr "VÀÀrÀ salasana"
-
-#: app/controllers/form_type_controller.rb:19
@@ -3078 +3118 @@
-
-#: app/views/shared/reset_password.rhtml:6
-user
+shared
-msgid "New password"
-msgstr "Uusi salasana"
-
-#: app/views/shared/reset_password.rhtml:10
-user
+shared
-msgid "New password confirmation"
-msgstr "Uuden salasanan varmistus"
@@ -3102 +3142 @@
-msgid "Reset password"
-msgstr "Nollaa salasana"
+
+#: app/views/shared/change_password.rhtml:6
+msgid "Old password"
+msgstr "Vanha salasana"
+
+#: app/views/shared/change_password.rhtml:18
+msgid "Change"
+msgstr "Vaihda"
-
-#: app/views/shared/_list_items.rhtml:168
@@ -3115 +3163 @@
-
-#: app/views/shared/_list_items.rhtml:196
-#, fuzzy
-msgid "Export list:"
-Raporttilista
+Vie lista:
-
-#: app/views/shared/_list_items.rhtml:197
@@ -3137 +3184 @@
-#: app/views/shared/_list_items.rhtml:311
-#: app/views/shared/export_items_csv.rhtml:37
-2
+4
-msgid "No"
-msgstr "Ei"
@@ -3144 +3191 @@
-#: app/views/shared/export_items_csv.rhtml:39
-#: app/views/form/remove.rhtml:5
-4
+6
-msgid "Yes"
-msgstr "KyllÀ"
@@ -3169 +3216 @@
-msgstr "Kirjaudu sisÀÀn"
-
-#: app/views/user/change_password.rhtml:6
-msgid "Old password"
-msgstr "Vanha salasana"
-
-#: app/views/user/change_password.rhtml:18
-msgid "Change"
-msgstr "Vaihda"
-
-#: app/views/user/edit.rhtml:1
-msgid "User information"
@@ -3214 +3253 @@
-
-#: app/views/layouts/mainlevel.rhtml:86
-49
+50
-msgid "Logged in as"
-msgstr "Kirjauduttu tunnuksella"
@@ -3320 +3359 @@
-msgstr "TÀytÀ kuvakenttÀ"
-
+#: app/views/customer_interface/comment_service_request.rhtml:7
+msgid "Message"
+msgstr "Viesti"
+
-#: app/views/customer_interface/_list_pagination.rhtml:15
-msgid "Previous"
@@ -3329 +3372 @@
-msgstr "Aikajana"
-
-6
+7
-msgid "My assets"
-msgstr "Omat kohteet"
-
-5
+6
-msgid "Open service requests"
-msgstr "Avoimet palvelupyynnöt"
-
-#: app/views/customer_interface/index.rhtml:36
-#: app/views/customer_interface/index.rhtml:39
+#: app/views/customer_interface/index.rhtml:42
-msgid "Statistics"
-msgstr "Tilasto"
-
-38
+41
-msgid "Open service requests by asset"
-msgstr "Avoimet palvelupyynnöt kohteittain"
@@ -3437 +3480 @@
-
-#: config/gettext_hack.rb:-
+msgid "customer"
+msgstr "asiakas"
+
+#: config/gettext_hack.rb:-
+msgid "asset"
+msgstr "kohde"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Parent"
+msgstr "Vanhempi"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Asset type"
+msgstr "Kohdetyyppi"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Created at"
+msgstr "Luotu"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Code"
+msgstr "Koodi"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Name"
+msgstr "Nimi"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Description"
+msgstr "Kuvaus"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Lock timeout"
+msgstr "Lukon aikakatkaisu"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Lock user"
+msgstr "Lukon omistaja"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Use parents permissions"
+msgstr "KÀytÀ ylemmÀn kohteen kÀyttöoikeuksia"
+
+#: config/gettext_hack.rb:-
+msgid "Asset|Customer"
+msgstr "Asiakas"
+
+#: config/gettext_hack.rb:-
+msgid "task type"
+msgstr "tehtÀvÀtyyppi"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Name"
+msgstr "Nimi"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Description"
+msgstr "Kuvaus"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Notification email"
+msgstr "Ilmoitusten osoite"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Notify on create"
+msgstr "Ilmoita luotaessa"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Notify on assign"
+msgstr "Ilmoita mÀÀrÀtessÀ"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Notify on accept"
+msgstr "Ilmoita hyvÀksyttÀessÀ"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Notify on close"
+msgstr "Ilmoita suljettaessa"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Notify on open"
+msgstr "Ilmoita avattaessa"
+
+#: config/gettext_hack.rb:-
+msgid "TaskType|Is service request type"
+msgstr "Palvelupyyntöjen tyyppi"
+
+#: config/gettext_hack.rb:-
-msgid "form"
-msgstr "lomake"
@@ -3485 +3616 @@
-
-#: config/gettext_hack.rb:-
-msgid "customer"
-msgstr "asiakas"
-
-#: config/gettext_hack.rb:-
-msgid "attachment"
-msgstr "Liitetiedosto"
@@ -3627 +3754 @@
-msgid "Task|Other edit"
-msgstr "Muut muokkaus"
-
-#: config/gettext_hack.rb:-
-msgid "asset"
-msgstr "kohde"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Parent"
-msgstr "Vanhempi"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Asset type"
-msgstr "Kohdetyyppi"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Created at"
-msgstr "Luotu"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Code"
-msgstr "Koodi"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Name"
-msgstr "Nimi"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Description"
-msgstr "Kuvaus"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Lock timeout"
-msgstr "Lukon aikakatkaisu"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Lock user"
-msgstr "Lukon omistaja"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Use parents permissions"
-msgstr "KÀytÀ ylemmÀn kohteen kÀyttöoikeuksia"
-
-#: config/gettext_hack.rb:-
-msgid "Asset|Customer"
-msgstr "Asiakas"
-
-#: config/gettext_hack.rb:-
-msgid "task type"
-msgstr "tehtÀvÀtyyppi"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Name"
-msgstr "Nimi"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Description"
-msgstr "Kuvaus"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Notification email"
-msgstr "Ilmoitusten osoite"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Notify on create"
-msgstr "Ilmoita luotaessa"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Notify on assign"
-msgstr "Ilmoita mÀÀrÀtessÀ"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Notify on accept"
-msgstr "Ilmoita hyvÀksyttÀessÀ"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Notify on close"
-msgstr "Ilmoita suljettaessa"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Notify on open"
-msgstr "Ilmoita avattaessa"
-
-#: config/gettext_hack.rb:-
-msgid "TaskType|Is service request type"
-msgstr "Palvelupyyntöjen tyyppi"
-
-#: config/gettext_hack.rb:23

trunk/public/javascripts/application.js

@@ -60 +60 @@
- * update_field_enabled('foobar') enables #foobar. Otherwise it disables
- * #foobar.
- 
+
- * Parameters:
- * -----------
@@ -75 +75 @@
-    field.setAttribute('disabled', 'true');
-}
+
+/* Function: disable_notify_new_user
+ * =================================
+ * Disables/enables the input with id 'model_notify_new_user'
+ * based on the content of the input with id 'model_email'.
+ */
+function disable_notify_new_user()
+{
+    var textField = $('model_email');
+    var checkBox = $('model_notify_new_user');
+
+    if (textField.value.length > 0)
+        checkBox.disabled = false;
+    else
+        checkBox.disabled = true;
+}

trunk/test/functional/customer_controller_test.rb

@@ -15 +15 @@
-    @task_type = TaskType.create!(:name => 'Test')
-    assert @task_type.set_as_service_request_type
+
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
-  end
-
@@ -47 +51 @@
-    get 'create'
-    assert_response :success
+    assert_template 'customer/_create'
-
-    fields = assigns(:fields)
@@ -125 +130 @@
-  end
-
+  # Method: test_create_and_notify
+  # ==============================
+  # Checks that email notification is sent to new customer when notify_new_user is set.
+  #
+  def test_create_and_notify
+    @keyring.action_keys << create_action_key('customer/create')
+    login('test')
+
+    # Create a valid customer with minimal info
+    attributes = {
+      'login' => 'customer',
+      'password' => 'secret',
+      'password_confirmation' => 'secret',
+      'name' => 'Test',
+      'email' => 'test@example.com',
+      'notify_new_user' => '1'
+    }
+    post 'create', :model => attributes
+    assert_response :redirect
+    assert_redirected_to :controller => 'customer', :action => 'list'
+
+    # Check that the customer was added succesfully and
+    # that authentication works for him.
+    new_customer = UserAccount.authenticate(attributes['login'], attributes['password'])
+    assert_equal true, new_customer.is_a?(Customer)
+    assert_equal assigns(:model), new_customer
+
+  &nbs