redirects are ok now

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/confirmations_controller.rb
This commit is contained in:
Harry Bomrah 2013-11-29 18:49:47 +08:00 committed by saurabhbhatia
parent ee1246caa4
commit b10a2edc22
8 changed files with 30 additions and 7 deletions

View File

@ -46,9 +46,9 @@ class BasicInfosController < ApplicationController
render :json => response.to_json render :json => response.to_json
end end
def confirmation
end
end end

View File

@ -1,7 +1,6 @@
class ConfirmationsController < Devise::ConfirmationsController class ConfirmationsController < Devise::ConfirmationsController
layout "devise" layout "devise"
def show def show
self.resource = resource_class.confirm_by_token(params[:confirmation_token]) self.resource = resource_class.confirm_by_token(params[:confirmation_token])

View File

@ -1,3 +1,6 @@
class RegistrationsController < Devise::RegistrationsController class RegistrationsController < Devise::RegistrationsController
layout "devise" layout "devise"
def after_sign_up_path_for(resource)
basic_infos_confirmation_path
end
end end

View File

@ -16,7 +16,7 @@
<% end %> <% end %>
</td> </td>
<td> <td>
<%= link_to (user_for_listing.name ? user_for_listing.name : user_for_listing.user_id),admin_users_new_interface_path(user_for_listing) %> <%= link_to (user_for_listing.name && user_for_listing.name != user_for_listing.email ? user_for_listing.name : user_for_listing.user_id),admin_users_new_interface_path(user_for_listing) %>
<div class="quick-edit"> <div class="quick-edit">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<%= content_tag(:li, link_to(t(:edit),edit_admin_users_new_interface_path(user_for_listing))) if is_admin? %> <%= content_tag(:li, link_to(t(:edit),edit_admin_users_new_interface_path(user_for_listing))) if is_admin? %>

View File

@ -18,7 +18,7 @@
<%= image_tag(user_for_summary.avatar) %> <%= image_tag(user_for_summary.avatar) %>
</div> </div>
<div class="member-info"> <div class="member-info">
<h4 class="member-name"><%= link_to (user_for_summary.name ? user_for_summary.name : user_for_summary.user_id),admin_users_new_interface_path(user_for_summary)%></h4> <h4 class="member-name"><%= link_to (user_for_summary.name && user_for_summary.name != user_for_summary.email ? user_for_summary.name : user_for_summary.user_id),admin_users_new_interface_path(user_for_summary)%></h4>
<div class="member-mail muted"><%= user_for_summary.email%></div> <div class="member-mail muted"><%= user_for_summary.email%></div>
<hr> <hr>
<ul class="member-roles"> <ul class="member-roles">

View File

@ -18,5 +18,5 @@
</div> </div>
<%= image_tag(user_for_thumbnail.avatar) %> <%= image_tag(user_for_thumbnail.avatar) %>
</div> </div>
<h4 class="member-name text-center"><%= link_to (user_for_thumbnail.name ? user_for_thumbnail.name : user_for_thumbnail.user_id),admin_users_new_interface_path(user_for_thumbnail)%></h4> <h4 class="member-name text-center"><%= link_to (user_for_thumbnail.name && user_for_thumbnail.name != user_for_thumbnail.email ? user_for_thumbnail.name : user_for_thumbnail.user_id),admin_users_new_interface_path(user_for_thumbnail)%></h4>
</li> </li>

View File

@ -0,0 +1,20 @@
<%= stylesheet_link_tag "sign_up" %>
<section id="main-wrap">
<div class="sign-up have-other-sign-in facebook-form">
<% flash.each do |key, msg| %>
<%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
<% end %>
<div class="form">
<h3 class="login-logo">Thank you for registering.</h3>
<div class="form-block">
<div class="form-list clearfix option-block">
<div class="alert alert-success">We have sent you a confirmation email on your email id. Please confirm to proceed</div>
<a href="<%= root_path %>">Home</a>
</div>
</div>
</div>
</div>
</section>

View File

@ -21,6 +21,7 @@ Orbit::Application.routes.draw do
get 'basic_infos/form' => "basic_infos#form_page" get 'basic_infos/form' => "basic_infos#form_page"
get 'basic_infos/role_page' => "basic_infos#role_page" get 'basic_infos/role_page' => "basic_infos#role_page"
get 'basic_infos/check_availability' => "basic_infos#check_availability" get 'basic_infos/check_availability' => "basic_infos#check_availability"
get 'basic_infos/confirmation' => "basic_infos#confirmation"
post 'basic_infos/role_update' => "basic_infos#role_update" post 'basic_infos/role_update' => "basic_infos#role_update"
match 'basic_infos/basic_info_update' => "basic_infos#basic_info_update" match 'basic_infos/basic_info_update' => "basic_infos#basic_info_update"
# routes for admin # routes for admin