Skip to content
Extraits de code Groupes Projets
Valider 2ce4fb27 rédigé par maxwell's avatar maxwell
Parcourir les fichiers

MS; removing some dumb user stuff

parent 2a9e988b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -7,7 +7,6 @@ class UsersController < ApplicationController
def show
@user = User.find_by_id params[:id]
@user_profile = @user.person.profile
respond_with @user
end
......@@ -21,6 +20,6 @@ class UsersController < ApplicationController
def update
@user = User.find_by_id params[:id]
@user.update_profile params[:user]
respond_with @user
respond_with(@user, :location => root_url)
end
end
......@@ -50,7 +50,7 @@
= owner_image_tag
= link_to current_user.real_name, current_user.person
%li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
%li.settings= link_to "settings", edit_user_path(current_user)
%li.settings= link_to "edit profile", edit_user_path(current_user)
%li.logout= link_to "logout", destroy_user_session_path
= render "shared/group_nav"
......
- title "New User"
= form_for @user do |f|
= f.error_messages
%p
= f.label :password
%br
= f.password_field :password
%p
= f.submit
%p= link_to "Back to List", users_path
.span-20.last
%h1= "#{@user.real_name}"
- if @user_profile
%p
%b url
%p
= @user.url
%p
%b Serialized Key
%p
= @user.serialized_key
......@@ -96,6 +96,7 @@ header {
position: relative;
display: inline;
float: right;
z-index: 3;
padding-right: 10px; }
header #session_action a.new_requests {
color: #df0101; }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter