Changeset 379

Timestamp:

01/05/07 17:13:36 (2 years ago)

Author:

jarmo

Message:

• Merged changes from [377], [378].
  
• Added migration for alpha8.
  

Files:

• branches/1.2-alpha/app/controllers/action_key_controller.rb (modified) (3 diffs)
• branches/1.2-alpha/app/controllers/asset_field_controller.rb (modified) (3 diffs)
• branches/1.2-alpha/app/controllers/asset_type_controller.rb (modified) (3 diffs)
• branches/1.2-alpha/app/controllers/keyring_controller.rb (modified) (7 diffs)
• branches/1.2-alpha/app/controllers/report_category_controller.rb (modified) (4 diffs)
• branches/1.2-alpha/app/controllers/user_group_controller.rb (modified) (3 diffs)
• branches/1.2-alpha/app/controllers/work_order_type_controller.rb (modified) (3 diffs)
• branches/1.2-alpha/app/models/report_field_value.rb (modified) (1 diff)
• branches/1.2-alpha/db/alpha_migrations/from_1.2.0-alpha7_to_1.2.0-alpha8.rb (added)

branches/1.2-alpha/app/controllers/action_key_controller.rb

@@ -13 +13 @@
-  layout 'mainlevel'
-
-  @@create_or_edit_fields = [
-                              [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ],
-                              [_('Information'), :text_field, 'info', { :size => 40, :maxlength => 80 } ]
-                            ]
-
-  def list
-    @help = 'general'
@@ -29 +24 @@
-    @help = 'general'
-    @title = _('Create a new key')
-
+
+
+
+
-    common_create(ActionKey, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -36 +34 @@
-    @help = 'general'
-    @title = _('Edit key')
-
+
+
+
+
-    common_edit(ActionKey, 'name', {:action => 'list'}, {:action => 'list'})
-  end

branches/1.2-alpha/app/controllers/asset_field_controller.rb

@@ -11 +11 @@
-class AssetFieldController < ApplicationController
-  append_before_filter :login_required
-
-  # Common part of form fields
-  @@form_fields = [
-                   [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ],
-                   [_('Type')],
-                   [_('User field in report template'), :text_field_with_prefix, 'user_field_name', { :size => 17, :maxlength => 17, :prefix => 'cmms_asset_' } ]
-                  ]
-
-  def list
@@ -46 +39 @@
-    @asset_type = AssetType.find(params[:id], :readonly => true)
-    @hide_subaction_links = true
-
+
+
+
+
+
+
-    fields[1][1..-1] = [:select, 'type_code', [
-                                               [_('String'), AssetField::STRING],
@@ -64 +62 @@
-    @asset_type = AssetType.find(params[:asset_type_id], :readonly => true)
-    @hide_subaction_links = true
-
+
+
+
+
+
-    fields[1][1..-1] = [:text, 'type_code_as_text']
-    @fields = fields

branches/1.2-alpha/app/controllers/asset_type_controller.rb

@@ -11 +11 @@
-class AssetTypeController < ApplicationController
-  prepend_before_filter :login_required
-  @@create_or_edit_fields = [
-                              [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ],
-                              [_('Icon'), :select_asset_type_icon, 'asset_type_icon_id'],
-                             [_('Typical maintenance time interval'), :input_field_with_enable_check_box, :select_time_interval, 'typical_maintenance_time_interval', {}, 'typical_maintenance_time_interval_enabled', 1, {:onclick => 'update_time_interval_field("typical_maintenance_time_interval")'}],
-                              [_('Description'), :markup_text_area, 'description', { :cols => 100, :rows => 20 }]
-                            ]
-
-  def list
@@ -50 +44 @@
-    @help = 'general'
-    @title = _('Create a new asset type')
-
+
+
+
+
+
+
-    params[:model][:set_typical_maintenance_time_interval] = nil if request.post? and params[:typical_maintenance_time_interval_enabled] != '1'
-    common_create(AssetType, 'name', {:action => 'list'}, {:action => 'list'}, 'asset_type/create_or_edit')
@@ -58 +57 @@
-    @help = 'general'
-    @title = _('Edit asset type')
-
+
+
+
+
+
+
-    params[:model][:set_typical_maintenance_time_interval] = nil if request.post? and params[:typical_maintenance_time_interval_enabled] != '1'
-    common_edit(AssetType, 'name', {:action => 'list'}, {:action => 'list'}, 'asset_type/create_or_edit')

branches/1.2-alpha/app/controllers/keyring_controller.rb

@@ -11 +11 @@
-class KeyringController < ApplicationController
-  prepend_before_filter :login_required
-
-  # Variable: action_key_update_notice
-  # ==================================
-  # Common notice which is appended to all flash[:notice]s when
-  # updating action_keys.
-  @@action_key_update_notice = _('Keys and keyrings are updated when user logins the next time.')
-
-  # Variable: create_or_edit_fields
-  # ===============================
-  # Fields for create and edit actions
-  @@create_or_edit_fields = [
-                              [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ],
-                              [_('Information'), :text_field, 'info', { :size => 40, :maxlength => 80 } ]
-                            ]
-
-  def list
@@ -45 +31 @@
-    @help = 'general'
-    @title = _('Create a new keyring')
-
+
+
+
+
-    common_create(Keyring, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -52 +41 @@
-    @help = 'general'
-    @title = _('Edit keyring')
-
+
+
+
+
-    common_edit(Keyring, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -93 +85 @@
-
-    info "Key #{action_key.name} added to keyring #{keyring.name}"
-@@
+
-  end
-
@@ -107 +99 @@
-    keyring.action_keys.delete(action_keys_to_revoke)
-
-@@
+
-  end
-
@@ -135 +127 @@
-
-    info "Keyring #{keyring.name} given to user #{user.login}"
-@@
+
-  end
-
@@ -149 +141 @@
-    keyring.users.delete(users_to_remove)
-
-
+
+
+
+
+
+
+
-  end
-end

branches/1.2-alpha/app/controllers/report_category_controller.rb

@@ -11 +11 @@
-class ReportCategoryController < ApplicationController
-  prepend_before_filter :login_required
-
-  # Fields for create and edit actions
-  @@create_or_edit_fields = [
-                              [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 }],
-                              [_('Tag'), :select, 'report_tag_id', ReportTag.find(:all, :order => 'name').map {|tag| [tag.full_name, tag.id] }, { :include_blank => true } ],
-                              [_('Parent'), :select, 'parent_id' ]
-                            ]
-
-  def list
@@ -34 +27 @@
-    @help = 'general'
-    @title = _('Create a new report category')
+    @fields = [
+                [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 }],
+                [_('Tag'), :select, 'report_tag_id', ReportTag.find(:all, :order => 'name').map {|tag| [tag.full_name, tag.id] }, { :include_blank => true } ],
+                [_('Parent'), :select, 'parent_id' ]
+              ]
-    update_possible_parents()
-    @fields = @@create_or_edit_fields
-    common_create(ReportCategory, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -43 +40 @@
-    @title = _('Edit report category')
-    @report_category = ReportCategory.find params[:id]
+    @fields = [
+                [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 }],
+                [_('Tag'), :select, 'report_tag_id', ReportTag.find(:all, :order => 'name').map {|tag| [tag.full_name, tag.id] }, { :include_blank => true } ],
+                [_('Parent'), :select, 'parent_id' ]
+              ]
-    update_possible_parents(@report_category)
-    @fields = @@create_or_edit_fields
-    common_edit(ReportCategory, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -81 +82 @@
-    end
-    # Options for parent select
-@create_or_edit_
+
-  end
-end

branches/1.2-alpha/app/controllers/user_group_controller.rb

@@ -11 +11 @@
-class UserGroupController < ApplicationController
-  prepend_before_filter :login_required
-
-  # Variable: create_or_edit_fields
-  # ===============================
-  #
-  # Fields for create and edit actions
-  @@create_or_edit_fields = [
-                              [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ],
-                              [_('Information'), :text_field, 'information', { :size => 40, :maxlength => 80 } ]
-                            ]
-
-  # Function: list
@@ -47 +38 @@
-    @help = 'general'
-    @title = _('Create user group')
-
+
+
+
+
-    common_create(UserGroup, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -58 +52 @@
-    @help = 'general'
-    @title = _('Edit user group')
-
+
+
+
+
-    common_edit(UserGroup, 'name', {:action => 'list'}, {:action => 'list'})
-  end

branches/1.2-alpha/app/controllers/work_order_type_controller.rb

@@ -14 +14 @@
-
-  # Fields for create and edit actions
-  @@create_or_edit_fields = [
-                              [_('Name'), :text_field, 'name', { :size => 40, :maxlength => 40 } ],
-                              [_('Tag'), :select, 'work_order_tag_id', WorkOrderTag.find(:all, :order => 'name').map {|tag| [tag.full_name, tag.id] }, { :include_blank => true } ],
-                              [_('Description'), :text_field, 'description', { :size => 40, :maxlength => 80 } ]
-                            ]
-
-  # Displays the work_order type listing
@@ -36 +31 @@
-    @help = 'general'
-    @title = _('New work order type')
-
+
+
+
+
+
-    common_create(WorkOrderType, 'name', {:action => 'list'}, {:action => 'list'})
-  end
@@ -52 +51 @@
-    @help = 'general'
-    @title = _('Edit work order type')
-
+
+
+
+
+
-    common_edit(WorkOrderType, 'name', {:action => 'list'}, {:action => 'list'})
-  end

branches/1.2-alpha/app/models/report_field_value.rb

@@ -18 +18 @@
-  def error_messages
-    result = []
-
-
+
+
+
-    }
-    return result