lib/generators/mindapp/templates/app/controllers/articles_controller.rb in mindapp2-0.1.1.3 vs lib/generators/mindapp/templates/app/controllers/articles_controller.rb in mindapp2-0.1.1.4

- old
+ new

@@ -28,11 +28,11 @@ user_id: $xvars["user_id"]) @article.save! end def my - @articles = Article.where(user_id: current_user).desc(:created_at).page(params[:page]).per(10) + @articles = Article.where(user_id: current_ma_user).desc(:created_at).page(params[:page]).per(10) @page_title = 'Member Login' end def update # $xvars["select_article"] and $xvars["edit_article"] @@ -46,10 +46,10 @@ body: $xvars["edit_article"]["article"]["body"]) end def destroy - if current_user.role.upcase.split(',').include?("A") || current_user == @article.user + if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @article.user @article.destroy end redirect_to :action=>'index' end