app/views/todos/_inline_edit.html.erb @@ -8,8 +8,9 @@ Currently has translations for Russian, Chinese, Spanish, Italian, French, Germa Please check the issues page(thanks Mischa!) for current known bugs. == Release 0.0.3.9 -* Merging in of nowhereman's changes -* Massive refactoring of the todo associations to make them simpler and more generic. +* Merging in of nowhereman's changes(thanks for all the features!) +* Re-implementation of todo editing functionality - now you can edit everything, not just text. +* Massive refactoring of the todo associations to make them simpler and more generic, and to prepare for templates. * Russian translations added == Release 0.0.3.8 README.rdoc @@ -13,7 +13,7 @@ class TodosController < ApplicationController #end #before_filter :find_project #, :only => [:index] - before_filter :find_todo, :only => [:destroy, :show, :toggle_complete, :edit] + before_filter :find_todo, :only => [:destroy, :show, :toggle_complete, :edit, :update] before_filter :authorize helper :todos @@ -52,18 +52,15 @@ class TodosController < ApplicationController # raise ex, l(:todo_not_found_error) #end - if @todo - respond_to do |format| - format.html { render } - #format.js { render :action => 'show' } - end - else - flash.now[:error] = @todo.errors.collect{|k,m| m}.join - respond_to do |format| - format.html { redirect_to :action => 'index' } - #format.js { render :action => 'edit' } - end + respond_to do |format| + format.html { render } + format.js { + @element_html = render_to_string :partial => 'todos/todo', + :locals => {:todo => @todo, :editable => true} + render :template => "todos/todo.rjs" + } end + end def new @@ -129,24 +126,43 @@ class TodosController < ApplicationController #render :action => "sort.rjs" end + def update + if @todo.update_attributes(params[:todo]) + if request.xhr? + show + else + flash[:notice] = "Todo updated!" + redirect_to :action => :index + end + else + render :text => "Error in update" + end + end def edit - if request.post? - #@todo = Todo.for_project(@project.id).find(params[:id]) - if @todo.update_attributes(:text => params[:text]) - @allowed_to_edit = User.current.allowed_to?(:edit_todos, parent_object) - respond_to do |format| - format.html { redirect_to :action => 'index' } - format.js { render :action => 'update', :controller => :todos } - end - else - flash.now[:error] = @todo.errors.collect{|k,m| m}.join - respond_to do |format| - format.html { redirect_to :action => 'index' } - format.js { render :action => 'edit', :controller => :todos } - end + if request.xhr? + respond_to do |format| + format.html { render :partial => "todos/inline_edit.html", :locals => {:todo => @todo} } end + else + raise "Non-ajax editing not supported..." end + + #if @todo.update_attributes(:text => params[:text]) + # @allowed_to_edit = User.current.allowed_to?(:edit_todos, parent_object) + # respond_to do |format| + # format.html { render :partial => "todos/inline_edit.html", :locals => {:todo => @todo} } + #format.js { render :action => 'update', :controller => :todos } + #format.js { render :partial => "todos/inline_edit.html", :locals => {:todo => @todo} } + # end + #else + # flash.now[:error] = @todo.errors.collect{|k,m| m}.join + # respond_to do |format| + #format.html { redirect_to :action => 'index' } + # format.js { render :action => 'edit', :controller => :todos } + # end + #end + end protected app/controllers/todos_controller.rb @@ -28,6 +28,11 @@ :html => {:class => 'icon-new'}, :update => "todo#{todo.id}-new-box" ) + %><%= link_to_remote( image_tag('edit.png', :title => 'Edit'), + :url => edit_polymorphic_url( [parent_object,todo]), :method => :get, + :html => {:class => 'icon-edit'}, + :update => "todo_#{todo.id}" ) + %><%= link_to_remote( image_tag('delete.png', :title => l(:todo_delete_tooltip)), :url => polymorphic_url([ parent_object,todo]), :method => :delete, :confirm => l(:text_are_you_sure), :html => {:class => 'icon-delete'}, app/views/todos/_todo.html.erb @@ -94,3 +94,15 @@ dt.todo { background-image:url(../images/todo.png); } +.todos-edit { + border: 1px solid #e4e4e4; + padding: 0.7em; + margin:0.4em; + background-color:#f6f6f6; + float: left; +} +.clearer {} +.todos-edit form { display: inline; } + + + assets/stylesheets/todos.css @@ -1,14 +1,6 @@ #custom routes for this plugin ActionController::Routing::Routes.draw do |map| - #map.with_options :controller => 'todos' do |todos_routes| - #todos_routes.new_issue_todo 'projects/:project_id/issues/:issue_id/todos/:parent_id/new', :action => 'new' - #todos_routes.new_project_todo 'projects/:project_id/todos/:parent_id/new', :action => 'new' - #todos_routes.connect 'projects/:project_id/issues/:issue_id/todos/:parent_id/new(.:format)', :action => 'new' - #todos_routes.connect "projects/:project_id/todos/:action/:id" - #todos_routes.connect "projects/:project_id/todos/:action/:id.:format" - - #end map.resources :todos, :name_prefix => 'project_', :path_prefix => '/projects/:project_id', :member => {:toggle_complete => :post }, :collection => {:sort => :post} @@ -26,4 +18,14 @@ ActionController::Routing::Routes.draw do |map| # map.resources :comments, :path_prefix => '/articles/:article_id' + #map.with_options :controller => 'todos' do |todos_routes| + + #todos_routes.new_issue_todo 'projects/:project_id/issues/:issue_id/todos/:parent_id/new', :action => 'new' + #todos_routes.new_project_todo 'projects/:project_id/todos/:parent_id/new', :action => 'new' + #todos_routes.connect 'projects/:project_id/issues/:issue_id/todos/:parent_id/new(.:format)', :action => 'new' + #todos_routes.connect "projects/:project_id/todos/:action/:id" + #todos_routes.connect "projects/:project_id/todos/:action/:id.:format" + + #end + end config/routes.rb @@ -27,7 +27,7 @@ Redmine::Plugin.register :redmine_todos_plugin do name 'Redmine Todo Lists plugin' author 'David Lyons' description 'A plugin to create and manage agile-esque todo lists on a per project basis.' - version '0.0.3.8' + version '0.0.3.9' settings :default => { @@ -39,11 +39,11 @@ Redmine::Plugin.register :redmine_todos_plugin do permission :view_todos, {:todos => [:index, :show] } permission :edit_todos, - {:todos => [:create, :destroy, :new, :toggle_complete, :sort, :edit], - :issues => [:create, :destroy, :new, :toggle_complete, :sort, :edit]} + {:todos => [:create, :destroy, :new, :toggle_complete, :sort, :edit, :update], + :issues => [:create, :destroy, :new, :toggle_complete, :sort, :edit, :update]} permission :use_personal_todos, - {:mytodos => [:index,:destroy, :new, :create, :toggle_complete, :index, :sort, :edit]} + {:mytodos => [:index,:destroy, :new, :create, :toggle_complete, :index, :sort, :edit, :update]} end init.rb 14be91d1cd48b29fc583901509c6b463bda951d2 David Lyons dalyons@gmail.com http://github.com/dalyons/redmine-todos-scrum-plugin/commit/e981add4a7ca858b115318d0f50091546b860a80 e981add4a7ca858b115318d0f50091546b860a80 2009-09-30T23:43:18-07:00 2009-09-30T23:43:18-07:00 Re-implemented editing functionality to be more fully featured d164470d87eb9a24bb03cd226fc403dd28947df4 David Lyons dalyons@gmail.com