Changeset 357

Timestamp:

12/18/06 16:54:39 (2 years ago)

Author:

jarmo

Message:

* Merged changesets [327], [328], [331], [332], [333], [334], [335], [336], [338], [342], [343], [344], [345], [346], [347], [348], [349], [351], [354], [356] and parts of changesets [329], [330], [350], [352], [355] to the 1.0 branch

Files:

• branches/1.0/app/controllers/application.rb (modified) (6 diffs)
• branches/1.0/app/controllers/asset_controller.rb (modified) (2 diffs)
• branches/1.0/app/controllers/asset_permission_controller.rb (modified) (5 diffs)
• branches/1.0/app/controllers/data_permission_controller.rb (modified) (1 diff)
• branches/1.0/app/controllers/message_controller.rb (modified) (1 diff)
• branches/1.0/app/controllers/report_controller.rb (modified) (1 diff)
• branches/1.0/app/controllers/report_type_controller.rb (modified) (2 diffs)
• branches/1.0/app/controllers/user_controller.rb (modified) (4 diffs)
• branches/1.0/app/controllers/work_order_controller.rb (modified) (1 diff)
• branches/1.0/app/helpers/application_helper.rb (modified) (4 diffs)
• branches/1.0/app/models/asset.rb (modified) (39 diffs)
• branches/1.0/app/models/assets_user_group.rb (modified) (4 diffs)
• branches/1.0/app/models/report.rb (modified) (3 diffs)
• branches/1.0/app/models/report_field.rb (modified) (2 diffs)
• branches/1.0/app/views/asset_tree/_asset_tree.rhtml (modified) (1 diff)
• branches/1.0/app/views/asset_tree/_asset_types.rhtml (modified) (1 diff)
• branches/1.0/app/views/asset_tree/_recursive_tree_view.rhtml (deleted)
• branches/1.0/app/views/layouts/mainlevel.rhtml (modified) (2 diffs)
• branches/1.0/app/views/report/search.rhtml (modified) (1 diff)
• branches/1.0/app/views/report_type/create_step4.rhtml (modified) (2 diffs)
• branches/1.0/app/views/shared/_list_items.rhtml (modified) (5 diffs)
• branches/1.0/app/views/timeline/_display_event.rhtml (modified) (2 diffs)
• branches/1.0/app/views/user/edit.rhtml (modified) (1 diff)
• branches/1.0/app/views/work_order/_display_work_order_event.rhtml (modified) (1 diff)
• branches/1.0/app/views/work_order/_form.rhtml (modified) (2 diffs)
• branches/1.0/app/views/work_order/create.rhtml (modified) (1 diff)
• branches/1.0/app/views/work_order/view.rhtml (modified) (1 diff)
• branches/1.0/config/database_independent_sql.rb (modified) (2 diffs)
• branches/1.0/config/menu.rb (modified) (4 diffs)
• branches/1.0/db/migrate/001_initial.rb (modified) (2 diffs)
• branches/1.0/db/migrate/002_initial_data.rb (modified) (2 diffs)
• branches/1.0/lib/menu_helper.rb (modified) (1 diff)
• branches/1.0/public/javascripts/application.js (modified) (1 diff)
• branches/1.0/public/stylesheets/mainlevel.css (modified) (1 diff)
• branches/1.0/test/fixtures/action_keys.yml (modified) (1 diff)
• branches/1.0/test/fixtures/action_keys_keyrings.yml (modified) (1 diff)
• branches/1.0/test/functional/asset_controller_test.rb (modified) (1 diff)
• branches/1.0/test/functional/asset_permission_controller_test.rb (modified) (7 diffs)
• branches/1.0/test/functional/user_controller_test.rb (modified) (2 diffs)
• branches/1.0/test/functional/user_group_controller_test.rb (modified) (1 diff)
• branches/1.0/test/unit/asset_test.rb (modified) (1 diff)

branches/1.0/app/controllers/application.rb

@@ -9 +9 @@
-
-# Class: ApplicationController
-=====
+
-#
-# The filters added to this controller will be run for all controllers in the application.
@@ -206 +206 @@
-        flash[:notice] = msg_create_successful(@model)
-        redirect_to(redirect) and return
-e
+if @model.errors.empty?
-        flash[:error] = msg_system_failure_in(_('Creation'))
-      end
@@ -233 +233 @@
-        flash[:notice] = msg_changes_saved
-        redirect_to(redirect) and return
-e
+if @model.errors.empty?
-        flash[:notice] = msg_saving_failed
-      end
@@ -284 +284 @@
-    }
-
-1
+0
-  end
-
@@ -325 +325 @@
-  end
-
+  # Function: find_selected_assets
+  # ==============================
+  #
+  # Finds selected assets and constructs conditions for further database queries
+  # from selected assets.
-  def find_selected_assets
-    if session[:select_branches]
-      if session[:branch_depth] and session[:branch_depth] > 0
-@selected_assets = Asset.find_authorized_to_read(:all, :conditions => ['assets.id IN (?)', @selected_asset.id_and_subasset_ids(session[:branch_depth])])
+conditions = ['assets.id IN (?)', @selected_asset.id_and_subasset_ids(session[:branch_depth])]
-      else
-
-
-
+
+
-      if @selected_asset_type
-
-
+
+
+
+
-    else
-      @selected_assets = [@selected_asset]
@@ -364 +370 @@
-    if session[:view_as_list]
-      @assets_by_type = {}
-      if session[:select_branches]
-        ids = @selected_asset.id_and_subasset_ids - [@selected_asset.id]
-        assets = Asset.find_authorized_to_read(ids)
-      else
-        assets = @selected_asset.children
-      end
-      find_selected_assets
-
-
-
-
-
-
-
-
+
+
+
+
+
-        end
-      }
-    else
-      @open_node_list = session[:open_tree_node_list]
-      @nodes = Asset.find(:all, :readonly => 'true', :conditions => 'parent_id is null')
-    end
-  end

branches/1.0/app/controllers/asset_controller.rb

@@ -60 +60 @@
-    @new_asset.parent = @selected_asset
-    @new_asset.use_parents_permissions = true
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-  end
-
@@ -105 +107 @@
-
-      unless @selected_asset.update_attributes(params[:selected_asset])
-
+ if @selected_asset.errors.empty?
-        return
-      end

branches/1.0/app/controllers/asset_permission_controller.rb

@@ -33 +33 @@
-
-    @title = _('User groups that have permissions to asset %s', @selected_asset.code_and_name)
- 
+
-                [_('Name'), :name],
- 
+
-              ]
-    @items = @selected_asset.user_groups
@@ -93 +93 @@
-    remove_count = asset.remove_user_groups(params['delete'].keys)
-
+    unless remove_count
+      flash[:notice] = _('Forbidden action: You tried to remove all user groups, which have permission to edit asset permissions.')
+      return
+    end
+
-    if remove_count > 0
-      flash[:notice] = _('Removed this asset from %d user groups.', remove_count)
@@ -108 +113 @@
-
-    if @selected_asset.update_attribute(:use_parents_permissions, params[:selected_asset][:use_parents_permissions])
- 
-e
+
+if @selected_asset.errors.empty?
-      flash[:error] = msg_saving_failed
-    end
@@ -175 +180 @@
-
-    # Update user group's permissions to the asset.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -194 +201 @@
-  def update_permission_profiles
-    invalid_request and return unless request.post?
-
+
-    # find object and check that authorized to edit and that asset it belongs to isn't using parent's permissions.
-    assets_user_group = AssetsUserGroup.find(params[:id])

branches/1.0/app/controllers/data_permission_controller.rb

@@ -92 +92 @@
-      if @object.update_permissions(params[:permission], params[:object])
-        flash[:notice] = msg_changes_saved
-e
+if @object.errors.empty?
-        flash[:error] = msg_saving_failed
-      end

branches/1.0/app/controllers/message_controller.rb

@@ -38 +38 @@
-    if @message.unread
-      @message.unread = false
-
+ and @message.errors.empty?
-        flash[:error] = msg_saving_failed
-      end

branches/1.0/app/controllers/report_controller.rb

@@ -150 +150 @@
-        @report.editable = params[:report][:editable] if params[:report] and @report.report_type.editable
-        session[:image_fields].delete(@report_cookie) if session[:image_fields]
-
-
-
-
-
+
-          flash[:notice] = msg_changes_saved
-          redirect_to :action => 'view', :id => @report.id and return

branches/1.0/app/controllers/report_type_controller.rb

@@ -165 +165 @@
-    if request.post?
-      @new_field_group = ReportFieldGroup.new params['new_field_group']
-
+
+
-      if @new_field_group.valid?
-        @report_type.report_field_groups << @new_field_group
@@ -235 +236 @@
-    @groups = @report_type.report_field_groups
-    @available_field_groups = [ [_('Not in a group'), nil] ] + @groups.collect {|g| [g.name, g.id]}
-
+
+
-    @new_field_group = ReportFieldGroup.new
-  end

branches/1.0/app/controllers/user_controller.rb

@@ -75 +75 @@
-                       [_('Description'), :description]
-                      ]
-
-Permissions'), {:controller => 'keyring', :action => 'edit_keys', :image => '16x16/permission
-Us
+keyring_
+Keys'), {:controller => 'keyring', :action => 'edit_keys', :image => '16x16/key
+Own
-               ]
-    @keyring_post_params = { :action => 'remove_from_keyrings', :id => @model.id }
-
+
+
+
+
+
+
+
+
+
+
-
-    if request.post?
@@ -88 +97 @@
-        flash[:notice] = _('User information changed')
-        info "User information changed for #{@model.login}"
-e
+if @model.errors.empty?
-        flash[:error] = _('Unable to change user information')
-      end
@@ -98 +107 @@
-
-    # Ignore GET requests
-
+ or not params[:delete] or params[:delete].empty?
-
-    names = []
@@ -107 +116 @@
-    end
-    flash[:notice] = _('User %s removed from keyrings: %s', @user.login_and_name, names.join(','))
+  end
+
+  def remove_from_user_groups
+    redirect_to :back
+
+    # Ignore GET requests
+    return if request.get? or not params[:delete] or params[:delete].empty?
+
+    names = []
+    @user = User.find(params[:id])
+    for user_group in @user.user_groups.find(params[:delete].keys)
+      user_group.users.delete(@user)
+      names.push user_group.name
+    end
+    flash[:notice] = _('User %s removed from user groups: %s', @user.login_and_name, names.join(','))
-  end
-

branches/1.0/app/controllers/work_order_controller.rb

@@ -105 +105 @@
-    @users = @work_order.asset.users(@work_order.responsible_user_id)
-    
-
+wo_
-
-    if request.post?

branches/1.0/app/helpers/application_helper.rb

@@ -103 +103 @@
-    last_year = options[:first_year] + options[:years]
-    options[:include_time] = false unless options.has_key?(:include_time)
-/\[|\]/, '_
+'[', '_').gsub(/\]$/, '
-
-    select = select_tag("#{prefix}[year]", year_options(time.year, options[:first_year], last_year), {'id' => "#{id_prefix}_year"}) +
@@ -543 +543 @@
-  # Function: link_class_for_asset_tree_node
-  # ========================================
-node
-node.
-
- == node
+asset_id, asset_type_id
+
+
+.id == asset_id
-      if is_selected_type or not session[:select_branches]
-        return 'asset_tree_selected_asset'
@@ -566 +566 @@
-  # ========================================
-  def span_class_for_asset_tree_node(node)
-.
+_
-  end
-
-  # Function: cancel_tag
-===
+
-  #
-  # Retuns a cancellation submit button for forms.
@@ -640 +640 @@
-    table + end_form_tag
-  end
+
+  @@asset_code_and_name_sql = ActiveRecord::Base.connection.sql_concat(:code, ' (', :name, ')')
+  def find_asset_tree_nodes(group_ids, parent_id = nil, open_parent = true, branch_depth = nil)
+    parent_condition = parent_id ? "parent_id = #{parent_id}" : 'parent_id IS NULL'
+    create_subasset_aug_count = session[:move_mode] ? ", (SELECT COUNT(*) FROM assets_user_groups WHERE (asset_id = assets.id AND create_subasset = 1 AND user_group_id IN (#{group_ids.join(',')}))) AS create_subasset_aug_count" : ''
+    nodes = Asset.connection.execute("SELECT id, #@@asset_code_and_name_sql, asset_type_id, (SELECT COUNT(*) FROM assets T1 WHERE T1.parent_id = assets.id) AS child_count, (SELECT COUNT(*) FROM assets_user_groups WHERE (asset_id = assets.id AND user_group_id IN (#{group_ids.join(',')}))) AS aug_count #{create_subasset_aug_count} FROM assets WHERE #{parent_condition}")
+
+    results = []
+    for node in nodes
+      result = ""
+      is_open = (open_parent and @open_node_list and @open_node_list.include? node[0].to_i)
+      depth = @selected_asset.id == node[0].to_i ? 0 : branch_depth
+      is_authorized = node[4] != '0'
+
+      # The node above this one is closed so we only need to look for
+      # authorized children
+      unless open_parent
+        return 's' if is_authorized # Found authorized children (return values is not used but it should be other than "")
+      end
+
+      # Recurse if node has children
+      children = node[3] == '0' ? '' : find_asset_tree_nodes(group_ids, node[0], is_open, depth ? depth + 1 : nil) 
+
+      # Don't display this node if the user is unauthorized to read it and
+      # there were no authorized sub-assets
+      next unless is_authorized or children == ""
+
+      is_leaf = (children == "")
+      link_text = '<span class="' + (node[2] ? 'asset_type_' + node[2] : 'asset_type_0') + '">' + node[1] + '</span>'
+      tree_symbol = is_open ? image_tag('16x16/folder_min.gif') : image_tag('16x16/folder_plu.gif')
+
+      result += '<li class="' + (is_leaf ? 'tree_leaf' : 'tree') + '">'
+      result += '<a href="/asset_tree/toggle_tree_node_open?node_id=' + node[0] + '" class="tree_open_close">' + tree_symbol + '</a>' unless is_leaf
+      result += radio_button_tag('new_parent_id', node[0], false, :disabled => (@selected_asset.id == node[0].to_i or (branch_depth and branch_depth > 0) or node[5] == '0')) if session[:move_mode]
+      result += is_authorized ? '<a href="/asset_tree/select/' + node[0] + '" class="' + link_class_for_asset_tree_node(node[0].to_i, node[2].to_i, branch_depth) + '">' + link_text + '</a>' : link_text
+      result += '<ul class="tree">' + children + '</ul>' unless is_leaf or not is_open
+      result += '</li>'
+      results.push result
+    end
+    return results.join
+  end
-end
-

branches/1.0/app/models/asset.rb

@@ -2 +2 @@
-# See license agreement for additional rights
-
+# Class: Asset
+# ============
+#
-class Asset < ProtectorModel
-  # Protection
@@ -26 +29 @@
-  acts_as_tree :order => 'code'
-
+  # Function: Asset.minimal_select
+  # ==============================
+  #
-  # Returns the smallest possible SELECT clause that can be used in a find call for this model.
-  # Contains protected fields and +use_parents_permissions+.
@@ -32 +38 @@
-  end
-
+  # Function: Asset.full_code_for
+  # =============================
+  #
-  # Returns the full code for asset with the given id or nil
+  #
+  # Parameters:
+  # -----------
+  # id - Asset id
+  #
-  def Asset.full_code_for(id)
-    begin
@@ -41 +55 @@
-  end
-
+  # Function: Asset.get_first_authorized_to_read
+  # ============================================
+  #
-  # Returns the first found asset user is authorized to read.
-  # If user is unauthorized to read any assets raises an exception.
@@ -49 +66 @@
-  end
-
+  # Function: Asset.find_by_full_code
+  # =================================
+  #
-  # Finds assets user is authorized to read by the full code.
+  #
+  # Parameters:
+  # -----------
+  # full_code - Full code of an asset
+  #
-  def Asset.find_by_full_code(full_code)
-    code = full_code.split('-')[-1]
@@ -58 +83 @@
-  end
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  def Asset.find_authorized_to(operation, args)
-    return records_not_found(args) unless User.current_user
@@ -84 +117 @@
-  end
-
+  # Function: full_code
+  # ===================
+  #
-  # Returns the asset's full code.
-  #
-
- +Asset#code_prefix()+.
+ Asset#code_prefix().
+
-  def full_code
-    return self.code_prefix + self.code
-  end
-
+  # Function: code_prefix
+  # =====================
+  #
-  # Returns the asset's code prefix.
-  #
@@ -104 +143 @@
-  end
-
-
+
+
+
+
-  def code_and_name
-    self.code + ' (' + self.name + ')'
-  end
-
+  # Function: is_root?
+  #
-  # Returns true if asset is the root asset.
-  def is_root?
@@ -114 +158 @@
-  end
-
-
+
+
+
+
-  # i.e. returns asset's id and it's children's ids and their chilren's ids etc.
-  def id_and_subasset_ids(levels = nil)
@@ -124 +171 @@
-  end
-
+  # Function: path_to_root
+  # ======================
+  #
-  # Returns assets that are in the path from this asset to the root asset.
-  def path_to_root
@@ -130 +180 @@
-  end
-
+  # Function: users
+  # ===============
+  #
-  # Returns all users who belong to assets user groups.
-
+
+
+
+
+
-  def users(exclude_user_id = nil)
-    return [] if self.user_groups.empty?
@@ -140 +197 @@
-  end
-
+  # Function: authorized_to_read?
+  # =============================
+  #
-  # Returns true if the user is authorized to read this asset.
-  def authorized_to_read?
@@ -147 +207 @@
-  end
-
+  # Function: authorized_to_create_report?
+  # ======================================
+  #
-  # Returns true if the user is authorized to create reports to this asset
-  def authorized_to_create_report?
@@ -152 +215 @@
-  end
-
+  # Function: authorized_to_create_work_order?
+  # ==========================================
+  #
-  # Returns true if the user is authorized to create work_orders to this asset
-  def authorized_to_create_work_order?
@@ -157 +223 @@
-  end
-
+  # Function: authorized_to_attach_file?
+  # ====================================
+  #
-  # Returns true if the user is authorized to create attachments to this asset
-  def authorized_to_attach_file?
@@ -162 +231 @@
-  end
-
+  # Function: authorized_to_create_subasset?
+  # ========================================
+  #
-  # Returns true if the user is authorized to create sub-assets to this asset
-  def authorized_to_create_subasset?
@@ -167 +239 @@
-  end
-
+  # Function: authorized_to_edit_permissions?
+  # =========================================
+  #
-  # Returns true if the user is authorized to edit asset permissions for this asset
-  def authorized_to_edit_permissions?
@@ -172 +247 @@
-  end
-
+  # Function: authorized_to_remove?
+  # ===============================
+  #
-  # Returns true if the user is authorized to remove this asset
-  def authorized_to_remove?
@@ -177 +255 @@
-  end
-
+  # Function: authorized_to_create?
+  # ===============================
+  #
-  # Returns true if the user is authorized to create new instances of +datatype+ to this asset
-  def authorized_to_create?(datatype)
@@ -191 +272 @@
-  end 
-
+  # Function: has_subasset_authorized_to_read?
+  # ==========================================
+  #
-  # Returns true if asset has a sub-asset user is authorized to read.
-  def has_subasset_authorized_to_read?
@@ -200 +284 @@
-  end
-
-
-
-
+
+
+
+
+
-  # The same association is created also for all sub-assets using this asset's permissions.
-  # Returns true if the creation is successfull and returns false if it fails.
+  #
+  # Parameters:
+  # -----------
+  # user_group  - User group to add to this asset.
+  # permissions - Optional hash containing additional permissions to the user group,
+  #               e.g. :edit => true. Default {}.
+  #
-  def add_user_group(user_group, permissions = {})
-    raise("#{user_group.class} in not a UserGroup") unless user_group.is_a?(UserGroup)
@@ -222 +315 @@
-  end
-
+  # Function: remove_user_groups
+  # ============================
+  #
-  # Removes user groups with ids +user_group_ids+ from this asset i.e. removes
-  # all permissions to this asset from user groups with ids +user_group_ids+.
-
+
+
-  def remove_user_groups(user_group_ids)
-    raise('Unable to remove user groups without ids') if user_group_ids.empty?
@@ -231 +328 @@
-    associations_to_destroy = self.assets_user_groups.find(:all, :conditions => ['user_group_id IN (?)', user_group_ids])
-    remove_count = 0
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      end
-
+
+
+
+
-    return remove_count
-  end
-
-
+
+
+
+
-  # Return value contains at most one permission profile for each user group.
-  # If the current user belongs to multiple user groups and through them has multiple
@@ -250 +357 @@
-  # contains one permission profile which has all permissions the summed permission
-  # profiles have. Thus returned permission profiles contain all permissions there
-
-
-
+
+
+
+
+
+
-  def data_permission_profiles_for_current_user(datatype)
-    return [] unless user = User.current_user
@@ -280 +390 @@
-  end
-
+  # Function: node_depth
+  # ====================
+  #
-  # Returns the number of nodes in the asset tree below the receiving asset.
-  def node_depth
@@ -286 +399 @@
-  end
-
+  # Function: copy_permissions_from
+  # ===============================
+  #
-  # Copies all permissions (i.e. AssetsUserGroups and their DataPermissionProfiles)
-  # from Asset +asset+ to the receiver, whose existing permissions are destroyed.
@@ -294 +410 @@
-  end
-
+  # Function: copy_permissions_to_subassets
+  # =======================================
+  #
-  # Copies asset's permissions (i.e. AssetsUserGroups and their DataPermissionProfiles) to sub-assets.
-  # Permissions are copied only to those assets the user is authorized to edit.
@@ -300 +419 @@
-  # After call sub-assets will have the same permissions as the asset.
-  # Returns the number of assets the permissions where copied to.
-
-
+
+
+
+
+
+
+
-  def copy_permissions_to_subassets(node_levels_down = 1, assets_groups = self.assets_user_groups)
-    return 0 if node_levels_down < 1
@@ -313 +437 @@
-  end
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  def authorized_to(operation)
-    return false unless User.current_user
@@ -325 +455 @@
-  end
-
+  # Function: after_find
+  # ====================
+  #
-  # Saves values of protected fields and use_parents_permissions to instance variables,
-  # so that we can check if they have been changed.
@@ -333 +466 @@
-  end
-
+  # Function: check_authorized_to_edit_parent
+  # =========================================
+  #
-  # Prevents creation of parentless assets if root asset exists. Verifies that user is authorized to create new asset, which requires create_subasset permission to asset's parent.
-  def check_authorized_to_edit_parent
@@ -351 +487 @@
-  end
-
+  # Function: check_authorized_to_edit
+  # ==================================
+  #
-  # Verifies that user is authorized to edit this asset.
-  def check_authorized_to_edit
@@ -381 +520 @@
-  end
-
+  # Function: check_if_root_or_parent_node
+  # ======================================
+  #
-  # Prevents deletion of the root node and parent nodes.
-  def check_if_root_or_parent_node
@@ -387 +529 @@
-  end
-
+  # Function: check_use_parents_permissions
+  # =======================================
+  #
-  # Make sure parentless asset can't use parent's permissions.
-  # Copies parent asset's permissions to asset if new asset is created with
@@ -399 +544 @@
-  end
-
-
+
+
+
+
-  # to this asset if it is a new record or if user is authorized to edit this asset.
-  # Asset's existing permissions will be destroyed.
@@ -405 +553 @@
-  # If true +only_permission_profiles+ is given only data permission profiles will
-  # be copied - use this only if you are sure that asset's user groups and their
-
+
+
+
+
+
+
-  def copy_permissions(assets_groups)
-    return false unless self.new_record? or self.authorized_to_edit_permissions?
@@ -425 +578 @@
-  end
-
+  # Function: information_unchanged?
+  # ================================
+  #
-  # Returns true if all attributes, except use_parents_permissions, are unchanged.
-  def only_use_parents_permissions_changed?
@@ -435 +591 @@
-  end
-
+  # Function: use_parents_permissions_unchanged?
+  # ============================================
+  #
-  # Returns true if use_parents_permissions is unchanged.
-  def use_parents_permissions_unchanged?
@@ -440 +599 @@
-  end
-
+
+  # Function: permissions_valid?
+  # ============================
+  #
+  # Returns true if assets permissions are valid
+  def permissions_valid?
+    return true if AssetsUserGroup.find_by_asset_id_and_edit_permissions(self.id, true)
+    return false
+  end
-end
+