Adição de editar perfil

app/controllers/admin/logs_controller.rb

@@ -8,7 +8,7 @@ def index
       day, month, year = params[:date].split('-')
       date = DateTime.new(year.to_i, month.to_i, day.to_i)
       condition = ['created_at > ? AND created_at < ?', date.beginning_of_day, date.end_of_day]
-      @logs = Log.where(condition).page(params[:page]).per(4)
+      @logs = Log.where(condition).page(params[:page]).per(10)
     end
   end
 end

app/controllers/admin/projects_controller.rb

@@ -4,7 +4,7 @@ class Admin::ProjectsController < ApplicationController
   before_filter :find_users_by_param, :only => [:create, :update]
 
   def index
-    @projects = ::Project.paginate(:page => params[:page])
+    @projects = ::Project.page(params[:page]).per(10)
   end
 
   def show

app/controllers/admin/users_controller.rb

@@ -3,7 +3,7 @@ class Admin::UsersController < ApplicationController
   before_filter :authenticate!, :only_admin!
 
   def index
-    @users = User.paginate(:page => params[:page])
+    @users = User.page(params[:page]).per(10)
   end
 
   def show

app/models/permission.rb

@@ -1,15 +1,17 @@
 # encoding: utf-8
 class Permission
   @@defaults = {
-      gerente: [
-        { name: 'Gerenciar Projetos', controller: 'projects', actions: 'all' },
-        { name: 'Gerenciar Usuários', controller: 'users', actions: 'all' },
-        { name: 'Gerenciar Ips', controller: 'ips', actions: 'all' }
-      ],
-      comum: [
-        { name: 'Visualizer Projeto', controller: 'projects', actions: 'show' },
-        { name: 'Visualizar Usuário', controller: 'users', actions: 'show' }
-      ]
-    }
+    gerente: [
+      { name: 'Gerenciar Projetos', controller: 'projects', actions: 'all' },
+      { name: 'Gerenciar Usuários', controller: 'users', actions: 'all' },
+      { name: 'Gerenciar Ips', controller: 'ips', actions: 'all' }
+    ],
+    comum: [
+      { name: 'Visualizer Projeto', controller: 'projects', actions: 'show' },
+      { name: 'Visualizar Usuário', controller: 'users', actions: 'show' }
+    ]
+  }
+  def self.defaults
+    @@defaults
   end
 end

app/models/repository.rb

@@ -96,7 +96,7 @@ def project_path
     @project_name ||= sanitize_string_to_folder_name(self.project.name)
     @repository_name ||= sanitize_string_to_folder_name(self.name)
 
-    REPOS_PATH.join(@project_name, @repository_name)
+    REPOS_PATH.join(@project_name, @repository_name).to_s
   end
 
 

app/models/role.rb

@@ -2,7 +2,8 @@
 class Role < ActiveRecord::Base
   has_many :users
 
-  attr_accessible :permissions
+  attr_accessible :description, :name
+  attr_accessor :permissions
 
   validates :name,
             :presence => :true,
@@ -11,7 +12,7 @@ class Role < ActiveRecord::Base
 
   def self.defaults
     gerente = Role.find_or_create_by_name('Gerente', :description => 'Gerencia o sistema')
-    gerente.permissions = Permission.defaults[:gerente]
+    gerente.permissions = Permission::defaults[:gerente]
 
     comum = Role.find_or_create_by_name('Usuário Comum', :description => 'Usuário comum do sistema')
     comum.permissions = Permission.defaults[:comum]

app/views/admin/users/_form.html.erb

@@ -17,11 +17,11 @@
   </div>
   <div class="field">
     <%= f.label :password %>
-    <%= f.text_field :password %>
+    <%= f.password_field :password %>
   </div>
   <div class="field">
     <%= f.label :password_confirmation %>
-    <%= f.text_field :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
   </div>
   <div class="field">
     <%= f.label :admin %>

app/views/layouts/application.html.erb

@@ -14,7 +14,8 @@
 
           <ul nav nav-list>
             <% if current_user %>
-              <%= content_tag :li, link_to(t('logout'), logout_path, :method => :delete) %>
+              <%= content_tag :li, link_to(t('.logout'), logout_path, :method => :delete) %>
+              <%= content_tag :li, link_to(t('.editaccount'), editaccount_path) %>
             <% else %>
               <%= content_tag :li, link_to(t('.register'), new_user_path) if setting(:allow_register) == 'true' %>
               <%= content_tag :li, link_to(t('.login'), login_path) %>

app/views/users/edit.html.erb

@@ -1,2 +1,33 @@
-<h1>Users#edit</h1>
-<p>Find me in app/views/users/edit.html.erb</p>
+<h1><%= t('.title') %></h1>
+
+<%= form_for(@user) do |f| %>
+  <% if @user.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+
+      <ul>
+      <% @user.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.label :password %>
+    <%= f.password_field :password %>
+  </div>
+  <div class="field">
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+
+<% end %>

app/views/users/new.html.erb

@@ -27,11 +27,11 @@
   </div>
   <div class="field">
     <%= f.label :password %>
-    <%= f.text_field :password %>
+    <%= f.password_field :password %>
   </div>
   <div class="field">
     <%= f.label :password_confirmation %>
-    <%= f.text_field :password_confirmation %>
+    <%= f.password_field :password_confirmation %>
   </div>
   <div class="actions">
     <%= f.submit %>

config/locales/views/defaults/pt-BR.yml

@@ -21,10 +21,11 @@ pt-BR:
       ips: IPs
       logs: Logs
       settings: Configurações
+      editaccount: Editar seus Dados
   views:
     pagination:
       first: "«"
       last: "»"
       previous: "‹"
       next: "›"
-      truncate: "..."
+      truncate: "..."

config/locales/views/users/pt-BR.yml

@@ -1,5 +1,9 @@
 pt-BR:
   users:
+    new:
+      title: Cadastro de Usuário
+    edit:
+      title: Editar dados pessoais
     create:
       successfully_create: 'Sua conta foi criada com sucesso!'
     update:

config/routes.rb

@@ -11,10 +11,10 @@
 
 
   # Users routes
-  resources :users, :except => [:destroy], :path_names => {
-    :new => :signup,
-    :edit => :editaccount
-  }
+  get 'editaccount' => 'users#edit'
+  resources :users, :except => [:destroy, :edit], :path_names => {
+    :new => :signup } do
+  end
 
 
   # Projects routes