Changeset 362

Timestamp:

12/18/06 19:14:26 (2 years ago)

Author:

jarmo

Message:

• Revedted changes made in [361]
  
• Changed the creation of the root asset to work with sqlite 3.3.8 in windows. The old code caused the parent_id to be set to 0 instead of NULL.
  

Files:

• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/db/migrate/002_initial_data.rb (modified) (1 diff)

trunk/app/helpers/application_helper.rb

@@ -744 +744 @@
-  @@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)
- or parent_id = 0
+
-    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}")

trunk/db/migrate/002_initial_data.rb

@@ -28 +28 @@
-      connection.reset_pk_sequence!('assets') if ['PostgreSQL'].include?(connection.adapter_name)
-      # The root asset (id=1)
-
+, :parent_id => nil
-
-      # User permissions to assets