respond_to do |format|
if current_user.andand.is_admin
setup_params = {}
- if params['uuid'] && params['uuid'].size>0
- setup_params[:uuid] = params['uuid']
+ if params['user_uuid'] && params['user_uuid'].size>0
+ setup_params[:uuid] = params['user_uuid']
end
if params['email'] && params['email'].size>0
- user = {email: params['email'], openid_prefix: params['openid_prefix']}
+ user = {email: params['email']}
setup_params[:user] = user
end
+ if params['openid_prefix'] && params['openid_prefix'].size>0
+ setup_params[:openid_prefix] = params['openid_prefix']
+ end
if params['repo_name'] && params['repo_name'].size>0
setup_params[:repo_name] = params['repo_name']
end
<% content_for :tab_line_buttons do %>
<% if controller.model_class.creatable? %>
-<%= button_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}",
- { action: 'create', return_to: request.url },
- { class: 'btn btn-primary pull-right' } %>
+ <% if controller.model_class.name != 'User' %>
+ <%= button_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}",
+ { action: 'create', return_to: request.url },
+ { class: 'btn btn-primary pull-right' } %>
+ <% else %>
+ <%= link_to "Add a new #{controller.model_class.to_s.underscore.gsub '_', ' '}", setup_user_popup_path,
+ {class: 'btn btn-primary pull-right', :remote => true, 'data-toggle' => "modal", 'data-target' => '#modal-window'} %>
+ <div id="modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+ <% end %>
+
<% end %>
<% end %>
<div class="modal-body">
- <% uuid = @object.uuid %>
- <% disable_email = @object.uuid? %>
+ <% if @object%>
+ <% uuid = @object.uuid %>
+ <% email = @object.email %>
+ <% end %>
+ <% disable_email = uuid != nil %>
<% identity_url_prefix = @current_selections[:identity_url_prefix] %>
<% disable_url_prefix = (identity_url_prefix != nil) %>
<% selected_repo = @current_selections[:repo_name] %>
<% selected_vm = @current_selections[:vm_uuid] %>
- <%= form_tag setup_user_url(id: uuid), {id: 'setup_form', name: 'setup_form', method: 'get', class: 'form-search', remote: true, onSubmit: "validate(); return false;"} do %>
+<% puts "\n\n **************** setup_user_url = #{setup_user_url.inspect}" %>
+ <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: 'get', class: 'form-search', remote: true} do %>
+ <input id="user_uuid" maxlength="250" name="user_uuid" type="hidden" value="<%=uuid%>">
<div>
<table><tbody>
<tr>
<% if disable_email %>
<td> Email </td>
- <td> <input id="email" maxlength="250" name="email" type="text" value="<%=@object.email%>" disabled=true > </td>
+ <td> <input id="email" maxlength="250" name="email" type="text" value="<%=email%>" disabled=true > </td>
<% else %>
<td> Email </td>
<td> <input id="email" maxlength="250" name="email" type="text" > </td>
get 'signatures', on: :collection
end
get '/user_agreements/signatures' => 'user_agreements#signatures'
+ get "users/setup_popup" => 'users#setup_popup', :as => :setup_user_popup
+ get "users/setup" => 'users#setup', :as => :setup_user
resources :nodes
resources :humans
resources :traits
get 'activity', :on => :collection
post 'sudo', :on => :member
post 'unsetup', :on => :member
- get 'setup', :on => :member
get 'setup_popup', :on => :member
end
resources :logs