On Tue, 2010-09-21 at 16:06 +0200, [email protected] wrote: > From: Jozef Zigmund <[email protected]> > > --- > src/app/controllers/users_controller.rb | 6 +++++- > src/app/views/users/_form.haml | 14 +++++++------- > src/app/views/users/new.haml | 13 ++++++------- > 3 files changed, 18 insertions(+), 15 deletions(-) > This will need rebase to apply, but overall looks fine. One file below you don't need to change, as Jakub updated this one as well. Your best bet might be to do a rebase -i and move patch one to be the newest on the list, then you can: git reset --hard HEAD~1 which will kill off that patch. For this one you can also adjust it in that rebase -i so the file I note below is unaltered. Also, I would just squash patches 2 and 3 into one, dont think there is any real need for them to be separate. If you can resend that rebased single patch tomorrow, I should be able to ack it pretty quickly in my morning.
> diff --git a/src/app/controllers/users_controller.rb > b/src/app/controllers/users_controller.rb > index 8488509..0c82b1a 100644 > --- a/src/app/controllers/users_controller.rb > +++ b/src/app/controllers/users_controller.rb > @@ -70,4 +70,8 @@ class UsersController < ApplicationController > def index > @users = User.all > end > -end > \ No newline at end of file > + > + def section_id > + "loginpage" > + end > +end > diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml > index 7c4ee81..f433a99 100644 > --- a/src/app/views/users/_form.haml > +++ b/src/app/views/users/_form.haml > @@ -1,19 +1,19 @@ > %ul > %li > - = form.label :login, "Choose a username" > + = form.label :login, "User ID:" > = form.text_field :login > %li > - = form.label :password, form.object.new_record? ? "Choose a password" : > "Change password" > - = form.password_field :password > - %li > - = form.label :password_confirmation, "Confirm password" > - = form.password_field :password_confirmation > - %li > = form.label :first_name > = form.text_field :first_name > %li > = form.label :last_name > = form.text_field :last_name > %li > + = form.label :password, form.object.new_record? ? "Password" : "Change > password" > + = form.password_field :password > + %li > + = form.label :password_confirmation, "Confirm" > + = form.password_field :password_confirmation > + %li > = form.label :email > = form.text_field :email > diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml This file you can drop from the patch. -j _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
