db/migrate/20090516181911_remove_levels_from_raids.rb db/migrate/20090516203910_unique_index_on_locations.rb public/javascripts/jrails.js vendor/plugins/jrails/CHANGELOG vendor/plugins/jrails/README vendor/plugins/jrails/init.rb vendor/plugins/jrails/install.rb vendor/plugins/jrails/javascripts/jquery-ui.js vendor/plugins/jrails/javascripts/jquery.js vendor/plugins/jrails/javascripts/jrails.js vendor/plugins/jrails/javascripts/sources/jrails.js vendor/plugins/jrails/lib/jrails.rb vendor/plugins/jrails/tasks/jrails.rake @@ -36,15 +36,10 @@ class RaidsController < ApplicationController if @current_account == @raid.account or @current_account.admin @roles = Role.find(:all) @cclasses = Cclass.find(:all) - - respond_to do |format| - format.html - end + + @raid.locations.build else - flash[:error] = "You are not authorized to edit this account" - respond_to do |format| - format.html { redirect_to raid_url(@raid) } - end + redirect_to raid_url(@raid) end end @@ -52,15 +47,18 @@ class RaidsController < ApplicationController if @current_account.can_edit(@raid) @raid.update_attributes(params[:raid]) @raid.date = Time.parse("#{params[:caldate]} #{params[:caltime]}") - @raid.save - respond_to do |format| - format.html { redirect_to raid_url(@raid) } + if @raid.save + redirect_to raid_url(@raid) + else + flash[:error] = "Error saving raid" + render :action => :edit end + else + redirect_to raid_url(@raid) end end - def destroy if @current_account.can_edit(@raid) @raid.destroy app/controllers/raids_controller.rb @@ -3,7 +3,16 @@ class Location < ActiveRecord::Base belongs_to :instance has_many :loots + before_save :check_duplicates + def name instance.name end + + private + + def check_duplicates + not Raid.find(self.raid_id).instances.member?(self.instance) + end + end app/models/location.rb @@ -4,14 +4,19 @@ class Raid < ActiveRecord::Base belongs_to :instance has_many :locations - accepts_nested_attributes_for :locations, :allow_destroy => true + accepts_nested_attributes_for(:locations, :allow_destroy => true, + :reject_if => proc { |attr| + attr['instance_id'].blank? + }) has_many :instances, :through => :locations has_many :loots, :through => :locations belongs_to :raid_template has_many :slots, :dependent => :destroy - accepts_nested_attributes_for :slots, :allow_destroy => true + accepts_nested_attributes_for(:slots, + :allow_destroy => true) + has_many :signups, :dependent => :destroy has_many :characters, :through => :signups app/models/raid.rb @@ -1,2 +1 @@ -page[@raid].fade - +page.visual_effect(:fade, dom_id(@raid)) app/views/raids/destroy.js.rjs @@ -3,19 +3,28 @@ <% form_for(@raid) do |f| %> <dl> <dt>Name:</dt><dd><%= f.text_field :name %></dd> + <dt>Date:</dt> + <dd> + <%= text_field_tag "caldate", @raid.caldate, :size => 10 %> + @ + <%= text_field_tag "caltime", @raid.caltime, :size => 8 %> + </dd> <dt>Instances:</dt> <dd> - <ul> - <% @raid.instances.each do |instance| %> - <li><%= instance.name %></li> + <ul id="locations"> + <% f.fields_for :locations do |l| %> + <li> + <%= l.collection_select(:instance_id, + l.object.new_record? ? (Instance.active - @raid.instances) : Instance.active, + :id, :name, :include_blank => l.object.new_record?) %> + <% unless l.object.new_record? %> + <%= l.check_box '_delete' %> + <%= l.label '_delete', 'Remove' %> + <% end %> + </li> <% end %> </ul> </dd> - <dt>Date:</dt><dd><%= text_field_tag "caldate", @raid.caldate, :size => 10 %> @ <%= text_field_tag "caltime", @raid.caltime, :size => 8 %></dd> - <dt>Level Requirement:</dt> - <dd> - <%= f.text_field :min_level, :size => 3 %>-<%= f.text_field :max_level, :size => 3 %> - </dd> <dt>Loot:</dt> <dd><%= f.text_area :loot_note, :rows => 5, :cols => 40 %></dd> <dt>Note:</dt> app/views/raids/edit.html.erb @@ -34,15 +34,18 @@ <dd><%= @raid.account.name %></dd> <dt>Date:</dt> <dd><%= @raid.date.to_s(:raid) %></dd> - <dt>Levels:</dt> - <dd> - <%= @raid.min_level %> - <%= " to #{@raid.max_level}" if @raid.max_level != @raid.min_level %> - </dd> <%- if !@raid.loot_note.blank? -%> <dt>Loot rules:</dt> <dd><%= @raid.loot_note %></dd> <%- end -%> + <dt>Instances:</dt> + <dd> + <ul> + <% @raid.instances.each do |instance| %> + <li><%= instance.name %></li> + <% end %> + </ul> + </dd> <%- if !@raid.note.blank? -%> <dt>Note:</dt> <dd><%= @raid.note %></dd> app/views/raids/show.html.erb @@ -40,6 +40,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :raids, :member => { 'finalize' => :post } do |raids| raids.resources :signups, :loots raids.resources :slots, :collection => { 'wait_list' => :put } + raids.resources :locations end map.namespace :admin do |admin| config/routes.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090509042041) do +ActiveRecord::Schema.define(:version => 20090516203910) do create_table "accounts", :force => true do |t| t.string "name" @@ -93,6 +93,8 @@ ActiveRecord::Schema.define(:version => 20090509042041) do t.datetime "updated_at" end + add_index "locations", ["raid_id", "instance_id"], :name => "locations_by_raid_and_instance", :unique => true + create_table "loots", :force => true do |t| t.integer "character_id", :default => 0, :null => false t.integer "list_id", :default => 0, :null => false @@ -115,8 +117,6 @@ ActiveRecord::Schema.define(:version => 20090509042041) do create_table "raids", :force => true do |t| t.string "name", :null => false t.datetime "date", :null => false - t.integer "min_level" - t.integer "max_level" t.text "note" t.text "loot_note" t.boolean "uses_loot_system", :default => false, :null => false db/schema.rb d98570578395ccbabd9bb1a413d92e6300e44f23 Christopher Giroir kelsin@valefor.com http://github.com/Kelsin/lilyraid/commit/d1242c6da2975e6292c7d50c5eb057971b03713f d1242c6da2975e6292c7d50c5eb057971b03713f 2009-05-16T13:53:25-07:00 2009-05-16T13:53:25-07:00 Lots of work on editing instances. Also added jrails ba8ddf07cfb8ea63beeca04103e1ae3ad505fb1c Christopher Giroir kelsin@valefor.com