fix errors

lab2023 · Aug 3, 2016 · b0ea802 · b0ea802
1 parent dcf32d1
commit b0ea802
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/dump.rdb b/dump.rdb
diff --git a/templates/app/controllers/user/profile_controller.rb b/templates/app/controllers/user/profile_controller.rb
@@ -5,7 +5,7 @@ class User::ProfileController < User::UserApplicationController
 
   def show
     add_breadcrumb @profile.full_name, user_profile_path
-    respond_with([:user, @profile])
+    respond_with(:user, @profile)
   end
 
   def edit
@@ -14,7 +14,7 @@ def edit
 
   def update
     @profile.update(profile_params)
-    respond_with([:user, @profile], location: user_profile_path)
+    respond_with(:user, @profile, location: user_profile_path)
   end
 
   private

diff --git a/...s/app/views/user/profiles/_form.html.haml → ...es/app/views/user/profile/_form.html.haml b/...s/app/views/user/profiles/_form.html.haml → ...es/app/views/user/profile/_form.html.haml
diff --git a/templates/app/views/user/profile/edit.html.haml b/templates/app/views/user/profile/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :form_title do
+  = t('tt.edit', resource_name: User.model_name.human)
+= render 'form'
diff --git a/...es/app/views/user/profiles/show.html.haml → ...tes/app/views/user/profile/show.html.haml b/...es/app/views/user/profiles/show.html.haml → ...tes/app/views/user/profile/show.html.haml
@@ -1,7 +1,7 @@
 .panel.panel-default
   .panel-heading
     %i.icon-edit.icon-large
-    = t('tt.show', resource_name: user.model_name.human)
+    = t('tt.show', resource_name: User.model_name.human)
   .panel-body
     = show_for @profile do |s|
       = s.attribute :name

diff --git a/templates/app/views/user/profiles/edit.html.haml b/templates/app/views/user/profiles/edit.html.haml