six-updater-web 0.16.3 → 0.17.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.16.3'
+  s.version = '0.17.0'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/controllers/categories_controller.rb

@@ -0,0 +1,15 @@
+class CategoriesController < ApplicationController
+  record_select :per_page => 10, :search_on => "name", :order_by => "name ASC", :full_text_search => true
+  active_scaffold Category do |config|
+    config = self # Ruby 1.9 compat
+    config.columns = [
+      :name,
+      :mods,
+      :created_at
+    ]
+    config.list.sorting = { :name => :asc }
+    [:mods].each do |c|
+      config.columns[c].form_ui = :record_select
+    end
+  end
+end

data/lib/six-updater-web/app/controllers/mods_controller.rb

@@ -6,13 +6,16 @@ class ModsController < ApplicationController
       :name,
       :version,
       :version_local,
+      :size,
+      :categories,
       :path,
       :sixconfigs,
       :networks,
       :queryservers,
-      :depmods,
+      :mods,
 #      :created_at,
       :updated_at,
+      :updated_version,
       :priority,
       :skip,
       :disabled,
@@ -21,7 +24,7 @@ class ModsController < ApplicationController
     config.update.columns.exclude :remote, :queryservers, :servers
     config.action_links.add 'copy', :label => 'Clone', :type => :record, :position => false, :confirm => "Do you really want to *clone* this item?"
 
-    config.list.columns.exclude :sixconfigs, :servers, :path
+    config.list.columns.exclude :sixconfigs, :servers, :path, :updated_at, :priority
 
     config.list.sorting = { :name => :asc }
 
@@ -34,10 +37,11 @@ class ModsController < ApplicationController
     config.columns[:priority].label = "Prio"
     config.columns[:version_local].label = "Local"
     config.columns[:version].label = "Ver"
+    config.columns[:mods].label = "Dependencies"
 #    config.columns[:changelog_link].label = "Changelog"
     config.columns[:queryservers].label = "Gamespy servers"
 
-    [:depmods, :networks, :servers, :queryservers, :sixconfigs].each do |c|
+    [:mods, :networks, :servers, :queryservers, :sixconfigs, :categories].each do |c|
       config.columns[c].form_ui = :record_select
     end
 

data/lib/six-updater-web/app/helpers/mods_helper.rb

@@ -2,4 +2,11 @@ module ModsHelper
   def remote_column(record, b = nil)
     link_to "nfo", "http://updater.dev-heaven.net/#{record.rema}/#{record.id}", :target => "_blank"
   end
+  def size_column(record, b = nil)
+    if record.size
+      "%0.2f MB" % (record.size / 1024.0)
+    else
+      0
+    end
+  end
 end

data/lib/six-updater-web/app/models/category.rb

@@ -0,0 +1,5 @@
+class Category < ActiveRecord::Base
+  has_and_belongs_to_many :mods
+
+  six_guid
+end

data/lib/six-updater-web/app/models/mod.rb

@@ -3,17 +3,20 @@ class Mod < ActiveRecord::Base
   has_and_belongs_to_many :servers
   has_and_belongs_to_many :queryservers
   has_and_belongs_to_many :networks
+  has_and_belongs_to_many :categories
 
-  has_many :dependentmods
-  has_many :depmods, :through => :dependentmods
+  #has_many :dependentmods
+  #has_many :depmods, :through => :dependentmods
+  has_and_belongs_to_many :mods, :association_foreign_key => "depmod_id", :class_name => "Mod", :join_table => "dependentmods"
+  has_and_belongs_to_many :depmods, :foreign_key => "depmod_id", :class_name => "Mod", :join_table => "dependentmods"
 
   six_guid
 
-  def all_depmods
+  def all_dependentmods
     mods = []
-    self.depmods.each do |mod|
+    self.mods.each do |mod|
       mods << mod
-      mods += mod.all_depmods
+      mods += mod.all_dependentmods
     end
     mods.uniq
   end

data/lib/six-updater-web/app/models/network.rb

@@ -4,6 +4,6 @@ class Network < ActiveRecord::Base
   has_many :repositories
 
   def to_label
-    "#{self.name}"
+    "#{self.name} (#{self.repositories.size})"
   end
 end

data/lib/six-updater-web/app/models/sixconfig.rb

@@ -18,7 +18,7 @@ class Sixconfig < ActiveRecord::Base
     self.mods.each { |mod| m << mod unless m.include?(mod) }
     m.each {|mod| if (mod.new_record? && !mod.exists?(self.appsetting)); mod.disabled = true; end }
     ms = []
-    m.each {|mod| ms << mod; ms += mod.all_depmods} 
+    m.each {|mod| ms << mod; ms += mod.all_dependentmods} 
     ms.uniq
   end
 

data/lib/six-updater-web/app/models/system_setting.rb

@@ -47,6 +47,12 @@ class SystemSetting < ActiveRecord::Base
       status = Timeout::timeout(TIMEOUT) do
         Six::Network::Panel.login(self.server_username, self.server_password, true)
       end
+      # Temporary until migration done
+      begin
+        l += Category.imp
+      rescue => e
+        logger.info "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
+      end
       [Mod, Network, Server, Repository, Action, Appsetting, Sixconfig].each do |t|
         l += t.imp
       end

data/lib/six-updater-web/app/views/main/_check.haml

@@ -10,7 +10,7 @@
     - mods.each do |mod|
       %tr
         %td{:width => "30%"}
-          = link_to mod.name, "/mods/edit/#{mod.id}"
+          = link_to mod.name, "/mods/edit/#{mod.id}", {:title => "Size: #{mod.size}, Updated Version: #{mod.updated_version}"}
         %td{:class => if mod.version_local == mod.version; "green"; else; "red"; end}
           = if mod.version_local.empty?; "none" else; mod.version_local; end
         %td= mod.version

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.16.3"
+  VERSION = "0.17.0"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

data/lib/six-updater-web/db/migrate/20100520101651_remove_id_from_dependentmods.rb

@@ -0,0 +1,13 @@
+class RemoveIdFromDependentmods < ActiveRecord::Migration
+  def self.up
+    remove_column :dependentmods, :id
+    remove_column :dependentmods, :updated_at
+    remove_column :dependentmods, :created_at
+  end
+
+  def self.down
+    add_column :dependentmods, :id, :integer
+    add_column :dependentmods, :updated_at, :datetime
+    add_column :dependentmods, :created_at, :datetime
+  end
+end

data/lib/six-updater-web/db/migrate/20100520101652_create_categories.rb

@@ -0,0 +1,22 @@
+class CreateCategories < ActiveRecord::Migration
+  def self.up
+    create_table :categories, :id => false do |t|
+      t.string :id, :limit => 36, :null => false, :primary => true
+      t.string :name
+
+      t.timestamps :lock_version => false
+    end
+
+    create_table :categories_mods, :id => false do |t|
+      t.string :category_id, :limit => 36
+      t.string :mod_id, :limit => 36
+    end
+    # generate the join tables
+  end
+
+  def self.down
+    drop_table :categories
+    drop_table :categories_mods
+  end
+
+end

data/lib/six-updater-web/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100518094056) do
+ActiveRecord::Schema.define(:version => 20100520101652) do
 
   create_table "actions", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
@@ -31,13 +31,23 @@ ActiveRecord::Schema.define(:version => 20100518094056) do
     t.string   "modpath"
   end
 
-  create_table "dependentmods", :force => true do |t|
-    t.string   "mod_id",     :limit => 36
-    t.string   "depmod_id",  :limit => 36
+  create_table "categories", :id => false, :force => true do |t|
+    t.string   "id",         :limit => 36, :null => false
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  create_table "categories_mods", :id => false, :force => true do |t|
+    t.string "category_id", :limit => 36
+    t.string "mod_id",      :limit => 36
+  end
+
+  create_table "dependentmods", :id => false, :force => true do |t|
+    t.string "mod_id",    :limit => 36
+    t.string "depmod_id", :limit => 36
+  end
+
   create_table "goldberg_content_pages", :force => true do |t|
     t.string   "title"
     t.string   "name",            :null => false
@@ -258,6 +268,9 @@ ActiveRecord::Schema.define(:version => 20100518094056) do
     t.string   "saved_password"
   end
 
+  add_index "queryservers", ["ip", "port"], :name => "index_queryservers_on_ip_and_port"
+  add_index "queryservers", ["name"], :name => "index_queryservers_on_name"
+
   create_table "repositories", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
     t.string   "url"

data/lib/six-updater-web/lib/tasks/get.rake

@@ -24,8 +24,8 @@ namespace :get do
     preset = get_preset
     puts "#{preset.name} (#{preset.mods.size} mods)"
     preset.mods.each do |mod|
-      depmods = mod.all_depmods
-      puts "#{mod.name} (v#{mod.version_local}/#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{depmods.size} dependencies: #{depmods.map{|e| e.name}.join(", ")}"
+      dependentmods = mod.all_dependentmods
+      puts "#{mod.name} (v#{mod.version_local}/#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{dependentmods.size} dependencies: #{dependentmods.map{|e| e.name}.join(", ")}"
     end
   end
   
@@ -40,8 +40,8 @@ namespace :get do
       mods = Mod.find(:all)
     end
     mods.each do |mod|
-      depmods = mod.all_depmods
-      puts "#{mod.name} (v#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{depmods.size} dependencies: #{depmods.map{|e| e.name}.join(", ")}"
+      dependentmods = mod.all_dependentmods
+      puts "#{mod.name} (v#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{dependentmods.size} dependencies: #{dependentmods.map{|e| e.name}.join(", ")}"
     end
   end
 
@@ -58,8 +58,8 @@ namespace :get do
     servers.each do |server|
       puts "#{server.name}: #{server.country} / #{server.ping}ms"
       server.mods.each do |mod|
-        depmods = mod.all_depmods
-        puts "#{mod.name} (v#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{depmods.size} dependencies: #{depmods.map{|e| e.name}.join(", ")}"
+        dependentmods = mod.all_dependentmods
+        puts "#{mod.name} (v#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{dependentmods.size} dependencies: #{dependentmods.map{|e| e.name}.join(", ")}"
       end
     end
   end
@@ -69,8 +69,8 @@ namespace :get do
     preset = get_preset
     preset.imp
     preset.mods.each do |mod|
-      depmods = mod.all_depmods
-      puts "#{mod.name} (v#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{depmods.size} dependencies: #{depmods.map{|e| e.name}.join(", ")}"
+      dependentmods = mod.all_dependentmods
+      puts "#{mod.name} (v#{mod.version}, #{mod.size}B, Last updated: #{mod.updated_version}), #{dependentmods.size} dependencies: #{dependentmods.map{|e| e.name}.join(", ")}"
     end
     preset.save unless ENV['DYNAMIC']
   end

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_content_pages.yml

@@ -1,12 +1,9 @@
 --- 
 goldberg_content_pages_001: 
+  id: "1"
+  title: Home Page
   name: home
   markup_style_id: "1"
-  created_at: 2006-06-12 00:31:56
-  title: Home Page
-  permission_id: "3"
-  updated_at: 2009-12-19 16:36:01
-  id: "1"
   content: |-
     h1. Welcome to the Six Updater Suite
     
@@ -21,21 +18,21 @@ goldberg_content_pages_001:
     The Main Page contains all actions.
     
     The Configuration page and menu contains all configuration.
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2006-06-12 00:31:56
+  updated_at: 2009-12-19 16:36:01
   content_cache: |-
     <h1>Welcome to the Six Updater Suite</h1>
     <p>Please use the Top Navigation menu.<br />
     It is advised to first synchronize with the latest information of the server site.</p>
     <p>The Main Page contains all actions.<br />
     The Configuration page and menu contains all configuration.</p>
+  markup_style: Textile
 goldberg_content_pages_002: 
+  id: "2"
+  title: Session Expired
   name: expired
   markup_style_id: "1"
-  created_at: 2006-06-12 00:33:14
-  title: Session Expired
-  permission_id: "3"
-  updated_at: 2007-04-01 09:40:33
-  id: "2"
   content: |
     h1. Session Expired
     
@@ -43,73 +40,73 @@ goldberg_content_pages_002:
     
     To continue please login again.
 
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2006-06-12 00:33:14
+  updated_at: 2007-04-01 09:40:33
   content_cache: |-
     <h1>Session Expired</h1>
     <p>Your session has expired due to inactivity.</p>
     <p>To continue please login again.</p>
+  markup_style: Textile
 goldberg_content_pages_003: 
+  id: "3"
+  title: Not Found!
   name: notfound
   markup_style_id: "1"
-  created_at: 2006-06-12 00:33:49
-  title: Not Found!
-  permission_id: "3"
-  updated_at: 2007-04-01 09:40:33
-  id: "3"
   content: |-
     h1. Not Found
     
     The page you requested was not found!
     
     Please contact your system administrator.
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2006-06-12 00:33:49
+  updated_at: 2007-04-01 09:40:33
   content_cache: |-
     <h1>Not Found</h1>
     <p>The page you requested was not found!</p>
     <p>Please contact your system administrator.</p>
+  markup_style: Textile
 goldberg_content_pages_004: 
+  id: "4"
+  title: Permission Denied!
   name: denied
   markup_style_id: "1"
-  created_at: 2006-06-12 00:34:30
-  title: Permission Denied!
-  permission_id: "3"
-  updated_at: 2007-04-01 09:40:33
-  id: "4"
   content: |-
     h1. Permission Denied
     
     Sorry, but you don't have permission to view that page.
     
     Please contact your system administrator.
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2006-06-12 00:34:30
+  updated_at: 2007-04-01 09:40:33
   content_cache: |-
     <h1>Permission Denied</h1>
     <p>Sorry, but you don&#8217;t have permission to view that page.</p>
     <p>Please contact your system administrator.</p>
+  markup_style: Textile
 goldberg_content_pages_005: 
+  id: "6"
+  title: Contact Us
   name: contact_us
   markup_style_id: "1"
-  created_at: 2006-06-12 10:13:47
-  title: Contact Us
-  permission_id: "3"
-  updated_at: 2009-09-04 07:58:14
-  id: "6"
   content: |-
     h1. Contact Us
     
     Visit the six-updater Project Homepage at "DevHeaven":http://dev-heaven.net/wiki/six-arma-updater for further information, bug reports, etc.
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2006-06-12 10:13:47
+  updated_at: 2009-09-04 07:58:14
   content_cache: |-
     <h1>Contact Us</h1>
     <p>Visit the six-updater Project Homepage at <a href="http://dev-heaven.net/wiki/six-arma-updater">DevHeaven</a> for further information, bug reports, etc.</p>
+  markup_style: Textile
 goldberg_content_pages_006: 
+  id: "8"
+  title: Site Administration
   name: site_admin
   markup_style_id: "1"
-  created_at: 2006-06-21 21:32:35
-  title: Site Administration
-  permission_id: "1"
-  updated_at: 2007-04-01 09:40:33
-  id: "8"
   content: |
     h1. Goldberg Setup
     
@@ -162,7 +159,9 @@ goldberg_content_pages_006:
     
     Go here to view and edit the settings that determine how Goldberg operates.
 
-  markup_style: Textile
+  permission_id: "1"
+  created_at: 2006-06-21 21:32:35
+  updated_at: 2007-04-01 09:40:33
   content_cache: |-
     <h1>Goldberg Setup</h1>
     <p>This is where you will find all the Goldberg-specific administration and configuration features.  In here you can:</p>
@@ -197,14 +196,12 @@ goldberg_content_pages_006:
     <p>In the Menu Editor you can add and remove Menu Items and move them around.  The security of a Menu Item (whether the user can see it or not) depends on the Permission of the Action or Page attached to that Menu Item.</p>
     <h2>System Settings</h2>
     <p>Go here to view and edit the settings that determine how Goldberg operates.</p>
+  markup_style: Textile
 goldberg_content_pages_007: 
+  id: "9"
+  title: Administration
   name: admin
   markup_style_id: "1"
-  created_at: 2006-06-26 16:47:09
-  title: Administration
-  permission_id: "1"
-  updated_at: 2007-04-01 09:40:33
-  id: "9"
   content: |
     h1. Site Administration
     
@@ -214,20 +211,20 @@ goldberg_content_pages_007:
     
     You can add more menu items here to administer your application if you want, by going to "Setup, Menu Editor":/menu/setup/menus.
 
-  markup_style: Textile
+  permission_id: "1"
+  created_at: 2006-06-26 16:47:09
+  updated_at: 2007-04-01 09:40:33
   content_cache: |-
     <h1>Site Administration</h1>
     <p>This is where the administrator can set up the site.</p>
     <p>There is one menu item here by default &#8212; <a href="/menu/setup">Setup</a>.  That contains all the Goldberg configuration options.</p>
     <p>You can add more menu items here to administer your application if you want, by going to <a href="/menu/setup/menus">Setup, Menu Editor</a>.</p>
+  markup_style: Textile
 goldberg_content_pages_008: 
+  id: "10"
+  title: Credits and Licence
   name: credits
   markup_style_id: "1"
-  created_at: 2006-10-02 10:35:35
-  title: Credits and Licence
-  permission_id: "3"
-  updated_at: 2009-09-04 08:00:04
-  id: "10"
   content: |
     h1. General
     
@@ -291,7 +288,9 @@ goldberg_content_pages_008:
     Goldberg's implementation of tabbed panels was adapted from 
     "InternetConnection":http://support.internetconnection.net/CODE_LIBRARY/Javascript_Show_Hide.shtml.
 
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2006-10-02 10:35:35
+  updated_at: 2009-09-04 08:00:04
   content_cache: |-
     <h1>General</h1>
     <p>This application was created by using:<br />
@@ -322,14 +321,12 @@ goldberg_content_pages_008:
     <h3>Tabbed Panels</h3>
     <p>Goldberg&#8217;s implementation of tabbed panels was adapted from <br />
     <a href="http://support.internetconnection.net/CODE_LIBRARY/Javascript_Show_Hide.shtml">InternetConnection</a>.</p>
+  markup_style: Textile
 goldberg_content_pages_009: 
+  id: "11"
+  title: Not Permitted
   name: unconfirmed
   markup_style_id: 
-  created_at: 2007-04-01 10:37:42
-  title: Not Permitted
-  permission_id: "3"
-  updated_at: 2007-04-01 10:37:42
-  id: "11"
   content: |
     h1. Not Permitted
     
@@ -337,24 +334,27 @@ goldberg_content_pages_009:
     
     If there is an issue please contact the system administrator.
 
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2007-04-01 10:37:42
+  updated_at: 2007-04-01 10:37:42
   content_cache: |-
     <h1>Not Permitted</h1>
     <p>Sorry, but you are not allowed to log into the site until your registration has been confirmed.</p>
     <p>If there is an issue please contact the system administrator.</p>
+  markup_style: Textile
 goldberg_content_pages_010: 
+  id: "12"
+  title: Help
   name: help
   markup_style_id: 
-  created_at: 2010-01-01 20:13:21
-  title: Help
-  permission_id: "3"
-  updated_at: 2010-01-02 19:55:48
-  id: "12"
   content: |-
     Work in progress.
-
+    
     Please look at "Six Updater Suite Homepage":http://six.dev-heaven.net/wagn/Six_Updater_Suite
-  markup_style: Textile
+  permission_id: "3"
+  created_at: 2010-01-01 20:13:21
+  updated_at: 2010-01-02 19:55:48
   content_cache: |-
     <p>Work in progress.<br />
     Please look at <a href="http://six.dev-heaven.net/wagn/Six_Updater_Suite">Six Updater Suite Homepage</a></p>
+  markup_style: Textile

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_controller_actions.yml

@@ -223,7 +223,7 @@ goldberg_controller_actions_037:
   url_to_use: ""
 goldberg_controller_actions_038: 
   id: "41"
-  site_controller_id: "27"
+  site_controller_id: "28"
   name: index
   permission_id: 
   url_to_use: ""

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_permissions.yml

@@ -1,16 +1,16 @@
 --- 
 goldberg_permissions_001: 
-  name: Administer site
   id: "1"
+  name: Administer site
 goldberg_permissions_002: 
-  name: Public pages - edit
   id: "2"
+  name: Public pages - edit
 goldberg_permissions_003: 
-  name: Public pages - view
   id: "3"
+  name: Public pages - view
 goldberg_permissions_004: 
-  name: Public actions - execute
   id: "4"
+  name: Public actions - execute
 goldberg_permissions_005: 
-  name: Members only page -- view
   id: "5"
+  name: Members only page -- view

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_roles.yml

@@ -56,12 +56,18 @@ goldberg_roles_001:
           index: false
         repositories: 
           index: false
-        servers: 
+        queryservers: 
           index: false
         logs: 
           index: false
         logsessions: 
           index: false
+        system_settings: 
+          index: false
+        networks: 
+          index: false
+        categories: 
+          index: true
       controllers: 
         goldberg/content_pages: false
         goldberg/controller_actions: false
@@ -84,6 +90,9 @@ goldberg_roles_001:
         logs: false
         logviews: false
         queryservers: false
+        networks: false
+        system_settings: false
+        categories: true
       pages: 
         home: true
         expired: true
@@ -101,7 +110,7 @@ goldberg_roles_001:
       role_id: 1
       role_ids: 
       - 1
-      updated_at: 2010-04-02 10:29:14 Z
+      updated_at: 2010-06-01 18:14:40 +02:00
     :menu: !ruby/object:Goldberg::Menu 
       by_id: 
         30: &id001 !ruby/object:Goldberg::Menu::Node 
@@ -129,7 +138,7 @@ goldberg_roles_001:
       - *id001
 
   created_at: 2006-06-23 21:03:49
-  updated_at: 2010-04-02 10:29:14
+  updated_at: 2010-06-01 18:14:40
   start_path: 
 goldberg_roles_002: 
   id: "2"
@@ -188,12 +197,18 @@ goldberg_roles_002:
           index: false
         repositories: 
           index: false
-        servers: 
+        queryservers: 
           index: false
         logs: 
           index: false
         logsessions: 
           index: false
+        system_settings: 
+          index: false
+        networks: 
+          index: false
+        categories: 
+          index: true
       controllers: 
         goldberg/content_pages: false
         goldberg/controller_actions: false
@@ -216,6 +231,9 @@ goldberg_roles_002:
         logs: false
         logviews: false
         queryservers: false
+        networks: false
+        system_settings: false
+        categories: true
       pages: 
         home: true
         expired: true
@@ -235,7 +253,7 @@ goldberg_roles_002:
       role_ids: 
       - 2
       - 1
-      updated_at: 2010-04-02 10:29:15 Z
+      updated_at: 2010-06-01 18:14:40 +02:00
     :menu: !ruby/object:Goldberg::Menu 
       by_id: 
         1: &id001 !ruby/object:Goldberg::Menu::Node 
@@ -298,7 +316,7 @@ goldberg_roles_002:
       - *id001
 
   created_at: 2006-06-23 21:03:50
-  updated_at: 2010-04-02 10:29:15
+  updated_at: 2010-06-01 18:14:40
   start_path: /main
 goldberg_roles_003: 
   id: "3"
@@ -357,12 +375,18 @@ goldberg_roles_003:
           index: true
         repositories: 
           index: true
-        servers: 
+        queryservers: 
           index: true
         logs: 
           index: true
         logsessions: 
           index: true
+        system_settings: 
+          index: true
+        networks: 
+          index: true
+        categories: 
+          index: true
       controllers: 
         goldberg/content_pages: true
         goldberg/controller_actions: true
@@ -385,6 +409,9 @@ goldberg_roles_003:
         logs: true
         logviews: true
         queryservers: true
+        networks: true
+        system_settings: true
+        categories: true
       pages: 
         home: true
         expired: true
@@ -407,7 +434,7 @@ goldberg_roles_003:
       - 3
       - 2
       - 1
-      updated_at: 2010-04-02 10:29:15 Z
+      updated_at: 2010-06-01 18:14:40 +02:00
     :menu: !ruby/object:Goldberg::Menu 
       by_id: 
         1: &id001 !ruby/object:Goldberg::Menu::Node 
@@ -428,6 +455,7 @@ goldberg_roles_003:
           - 22
           - 21
           - 20
+          - 31
           content_page_id: 
           controller_action_id: 38
           id: 15
@@ -598,8 +626,8 @@ goldberg_roles_003:
           name: Servers
           parent: 
           parent_id: 15
-          site_controller_id: 19
-          url: /servers/index
+          site_controller_id: 23
+          url: /queryservers/index
         21: &id018 !ruby/object:Goldberg::Menu::Node 
           content_page_id: 
           controller_action_id: 28
@@ -620,7 +648,17 @@ goldberg_roles_003:
           parent_id: 15
           site_controller_id: 17
           url: /repositories/index
-        25: &id020 !ruby/object:Goldberg::Menu::Node 
+        31: &id020 !ruby/object:Goldberg::Menu::Node 
+          content_page_id: 
+          controller_action_id: 40
+          id: 31
+          label: Networks
+          name: Networks
+          parent: 
+          parent_id: 15
+          site_controller_id: 24
+          url: /networks/index
+        25: &id021 !ruby/object:Goldberg::Menu::Node 
           content_page_id: 
           controller_action_id: 36
           id: 25
@@ -630,7 +668,7 @@ goldberg_roles_003:
           parent_id: 28
           site_controller_id: 20
           url: /logsessions/index
-        27: &id021 !ruby/object:Goldberg::Menu::Node 
+        27: &id022 !ruby/object:Goldberg::Menu::Node 
           content_page_id: 
           controller_action_id: 37
           id: 27
@@ -660,11 +698,12 @@ goldberg_roles_003:
         Servers: *id017
         Actions: *id018
         Mirrors: *id019
-        Logs: *id020
-        Output: *id021
+        Networks: *id020
+        Logs: *id021
+        Output: *id022
       crumbs: 
       - 1
-      root: &id022 !ruby/object:Goldberg::Menu::Node 
+      root: &id023 !ruby/object:Goldberg::Menu::Node 
         children: 
         - 1
         - 15
@@ -675,9 +714,9 @@ goldberg_roles_003:
       selected: 
         1: *id001
       vector: 
-      - *id022
+      - *id023
       - *id001
 
   created_at: 2006-06-23 21:03:48
-  updated_at: 2010-04-02 10:29:15
+  updated_at: 2010-06-01 18:14:40
   start_path: /main

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_roles_permissions.yml

@@ -1,21 +1,21 @@
 --- 
 goldberg_roles_permissions_001: 
-  permission_id: "1"
-  role_id: "3"
   id: "4"
+  role_id: "3"
+  permission_id: "1"
 goldberg_roles_permissions_002: 
-  permission_id: "3"
-  role_id: "1"
   id: "6"
+  role_id: "1"
+  permission_id: "3"
 goldberg_roles_permissions_003: 
-  permission_id: "2"
-  role_id: "3"
   id: "7"
+  role_id: "3"
+  permission_id: "2"
 goldberg_roles_permissions_004: 
-  permission_id: "4"
-  role_id: "1"
   id: "9"
+  role_id: "1"
+  permission_id: "4"
 goldberg_roles_permissions_005: 
-  permission_id: "5"
-  role_id: "2"
   id: "10"
+  role_id: "2"
+  permission_id: "5"

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_site_controllers.yml

@@ -115,7 +115,7 @@ goldberg_site_controllers_023:
   permission_id: "1"
   builtin: "0"
 goldberg_site_controllers_024: 
-  id: "27"
-  name: dependentmods
-  permission_id: "1"
+  id: "28"
+  name: categories
+  permission_id: "3"
   builtin: "0"

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_system_settings.yml

@@ -1,20 +1,20 @@
 --- 
 goldberg_system_settings_001: 
+  id: "1"
+  site_name: Six Updater Suite
+  site_subtitle: An application and mod manager
+  footer_message: By Sickboy
+  public_role_id: "1"
   session_timeout: "86400"
-  self_reg_send_confirmation_email: f
   site_default_page_id: "1"
+  not_found_page_id: "3"
   permission_denied_page_id: "4"
+  session_expired_page_id: "2"
   menu_depth: "3"
-  self_reg_enabled: t
   start_path: /main
   site_url_prefix: http://localhost:3000/
-  self_reg_confirmation_required: f
-  id: "1"
-  not_found_page_id: "3"
-  site_name: Six Updater Suite
-  public_role_id: "1"
+  self_reg_enabled: t
   self_reg_role_id: "1"
-  site_subtitle: An application and mod manager
-  footer_message: By Sickboy
-  session_expired_page_id: "2"
+  self_reg_confirmation_required: f
   self_reg_confirmation_error_page_id: "11"
+  self_reg_send_confirmation_email: f

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_users.yml

@@ -1,27 +1,27 @@
 --- 
 goldberg_users_001: 
+  id: "2"
   name: admin
-  password_expired: 
+  password: 1cb8e3dd1d92de3d27a1e6dcfe458f5f15cd2ae1
   role_id: "3"
+  password_salt: "577507000.10874027090329"
   fullname: ""
+  email: ""
   start_path: ""
   self_reg_confirmation_required: f
-  password_changed_at: 
-  id: "2"
-  password_salt: "577507000.10874027090329"
-  password: 1cb8e3dd1d92de3d27a1e6dcfe458f5f15cd2ae1
-  email: ""
   confirmation_key: 
+  password_changed_at: 
+  password_expired: 
 goldberg_users_002: 
+  id: "3"
   name: user
-  password_expired: 
+  password: 30f188cbab0fa1f484516e7960b93a186eac0b30
   role_id: "2"
+  password_salt: "575202500.204264655072264"
   fullname: user
+  email: ""
   start_path: ""
   self_reg_confirmation_required: f
-  password_changed_at: 
-  id: "3"
-  password_salt: "575202500.204264655072264"
-  password: 30f188cbab0fa1f484516e7960b93a186eac0b30
-  email: ""
   confirmation_key: 
+  password_changed_at: 
+  password_expired: 

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/networks.yml

@@ -0,0 +1 @@
+--- {}

data/lib/six-updater-web/vendor/plugins/six-db_manager/db/networks_repositories.yml

@@ -0,0 +1 @@
+--- {}

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 16
-  - 3
-  version: 0.16.3
+  - 17
+  - 0
+  version: 0.17.0
 platform: ruby
 authors: 
 - Sickboy
@@ -112,7 +112,7 @@ files:
 - lib/six-updater-web/app/controllers/actions_controller.rb
 - lib/six-updater-web/app/controllers/application_controller.rb
 - lib/six-updater-web/app/controllers/appsettings_controller.rb
-- lib/six-updater-web/app/controllers/dependentmods_controller.rb
+- lib/six-updater-web/app/controllers/categories_controller.rb
 - lib/six-updater-web/app/controllers/logsessions_controller.rb
 - lib/six-updater-web/app/controllers/logs_controller.rb
 - lib/six-updater-web/app/controllers/logviews_controller.rb
@@ -141,7 +141,7 @@ files:
 - lib/six-updater-web/app/helpers/system_settings_helper.rb
 - lib/six-updater-web/app/models/action.rb
 - lib/six-updater-web/app/models/appsetting.rb
-- lib/six-updater-web/app/models/dependentmod.rb
+- lib/six-updater-web/app/models/category.rb
 - lib/six-updater-web/app/models/log.rb
 - lib/six-updater-web/app/models/logsession.rb
 - lib/six-updater-web/app/models/log_observer.rb
@@ -221,6 +221,8 @@ files:
 - lib/six-updater-web/db/migrate/20100517174105_create_dependentmods.rb
 - lib/six-updater-web/db/migrate/20100518094056_change3_columns_mods.rb
 - lib/six-updater-web/db/migrate/20100520101650_add_more_indexes.rb
+- lib/six-updater-web/db/migrate/20100520101651_remove_id_from_dependentmods.rb
+- lib/six-updater-web/db/migrate/20100520101652_create_categories.rb
 - lib/six-updater-web/db/schema.rb
 - lib/six-updater-web/doc/README_FOR_APP
 - lib/six-updater-web/init.rb
@@ -825,9 +827,9 @@ files:
 - lib/six-updater-web/vendor/plugins/six-app_manager/lib/six/appmanager.rb
 - lib/six-updater-web/vendor/plugins/six-app_manager/Rakefile
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/actions.yml
-- lib/six-updater-web/vendor/plugins/six-db_manager/db/actions_sixconfigs.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/appsettings.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/appsettings_sixconfigs.yml
+- lib/six-updater-web/vendor/plugins/six-db_manager/db/dependentmods.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_content_pages.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_controller_actions.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/goldberg_menu_items.yml
@@ -840,6 +842,8 @@ files:
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/mods.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/mods_servers.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/mods_sixconfigs.yml
+- lib/six-updater-web/vendor/plugins/six-db_manager/db/networks.yml
+- lib/six-updater-web/vendor/plugins/six-db_manager/db/networks_repositories.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/queryservers.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/repositories.yml
 - lib/six-updater-web/vendor/plugins/six-db_manager/db/servers.yml

data/lib/six-updater-web/app/controllers/dependentmods_controller.rb

@@ -1,7 +0,0 @@
-class DependentmodsController < ApplicationController
-  active_scaffold :dependentmods do |config|
-    [:mod, :depmod].each do |c|
-      config.columns[c].form_ui = :record_select
-    end
-  end
-end

data/lib/six-updater-web/app/models/dependentmod.rb

@@ -1,4 +0,0 @@
-class Dependentmod < ActiveRecord::Base
-  belongs_to :mod
-  belongs_to :depmod, :class_name => "Mod"
-end