質問編集履歴
1
users_controller・_header_html.erbの２つを修正、edit_basic_info_html.erbを追加いたしました
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -36,11 +36,111 @@
|
|
|
36
36
|
|
|
37
37
|
|
|
38
38
|
|
|
39
|
-
●
|
|
39
|
+
●ヘッダーのリンクのviewを記載いたします(修正済み)
|
|
40
40
|
|
|
41
41
|
```ここに言語を入力
|
|
42
42
|
|
|
43
|
+
<header class= "navbar navbar-fixed-top navbar-inverse">
|
|
44
|
+
|
|
45
|
+
<div class= "container">
|
|
46
|
+
|
|
47
|
+
<%= link_to "勤怠システム", root_path , id: "logo" %>
|
|
48
|
+
|
|
49
|
+
<nav>
|
|
50
|
+
|
|
51
|
+
<ul class="nav navbar-nav navbar-right">
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
<% if logged_in? %>
|
|
56
|
+
|
|
57
|
+
<li><%= link_to "トップへ", users_path %></li>
|
|
58
|
+
|
|
59
|
+
<% if current_user.admin?%>
|
|
60
|
+
|
|
61
|
+
<li><%= link_to "ユーザ一覧", users_path %></li>
|
|
62
|
+
|
|
43
|
-
<li><%= link_to "
|
|
63
|
+
<li><%= link_to "edit_basic_info_user_path(user)" %></li>
|
|
64
|
+
|
|
65
|
+
<li class="dropdown">
|
|
66
|
+
|
|
67
|
+
<a href="#" class="dropdown-toggle", data-toggle="dropdown">
|
|
68
|
+
|
|
69
|
+
アカウント<b class="caret"></b>
|
|
70
|
+
|
|
71
|
+
</a>
|
|
72
|
+
|
|
73
|
+
<ul class="dropdown-menu">
|
|
74
|
+
|
|
75
|
+
<li><%= link_to "設定",edit_user_path(current_user)%></li>
|
|
76
|
+
|
|
77
|
+
<li class="divider"></li>
|
|
78
|
+
|
|
79
|
+
<li><%= link_to "ログアウト", logout_path, method: :delete %></li>
|
|
80
|
+
|
|
81
|
+
</ul>
|
|
82
|
+
|
|
83
|
+
</li>
|
|
84
|
+
|
|
85
|
+
<% else %>
|
|
86
|
+
|
|
87
|
+
<li class="dropdown">
|
|
88
|
+
|
|
89
|
+
<a href="#" class="dropdown-toggle", data-toggle="dropdown">
|
|
90
|
+
|
|
91
|
+
アカウント<b class="caret"></b>
|
|
92
|
+
|
|
93
|
+
</a>
|
|
94
|
+
|
|
95
|
+
<ul class="dropdown-menu">
|
|
96
|
+
|
|
97
|
+
<li><%= link_to "設定",edit_user_path(current_user) %></li>
|
|
98
|
+
|
|
99
|
+
<li class="divider"></li>
|
|
100
|
+
|
|
101
|
+
<li><%= link_to "ログアウト", logout_path, method: :delete %></li>
|
|
102
|
+
|
|
103
|
+
</ul>
|
|
104
|
+
|
|
105
|
+
</li>
|
|
106
|
+
|
|
107
|
+
<% end %>
|
|
108
|
+
|
|
109
|
+
<% else %>
|
|
110
|
+
|
|
111
|
+
<li><%= link_to "トップへ", root_path %></li>
|
|
112
|
+
|
|
113
|
+
<li><%= link_to "ログイン", login_path %></li>
|
|
114
|
+
|
|
115
|
+
<% end %>
|
|
116
|
+
|
|
117
|
+
</ul>
|
|
118
|
+
|
|
119
|
+
</nav>
|
|
120
|
+
|
|
121
|
+
</div>
|
|
122
|
+
|
|
123
|
+
</header>
|
|
124
|
+
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
```
|
|
128
|
+
|
|
129
|
+
|
|
130
|
+
|
|
131
|
+
●表示したいview(edit_basic_info)を記載します（追加）
|
|
132
|
+
|
|
133
|
+
|
|
134
|
+
|
|
135
|
+
```
|
|
136
|
+
|
|
137
|
+
<% provide(:title, 'edit_basic_info') %>
|
|
138
|
+
|
|
139
|
+
<h1>基本情報の更新</h1>
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
|
|
143
|
+
|
|
44
144
|
|
|
45
145
|
```
|
|
46
146
|
|
|
@@ -60,14 +160,112 @@
|
|
|
60
160
|
|
|
61
161
|
|
|
62
162
|
|
|
63
|
-
● userコントローラーにも記載しました
|
|
163
|
+
● userコントローラーにも記載しました(修正済み)
|
|
64
164
|
|
|
65
165
|
```ここに言語を入力
|
|
66
166
|
|
|
167
|
+
def class UsersController < ApplicationController
|
|
168
|
+
|
|
169
|
+
|
|
170
|
+
|
|
171
|
+
def index
|
|
172
|
+
|
|
173
|
+
end
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
def new
|
|
178
|
+
|
|
179
|
+
@user = User.new
|
|
180
|
+
|
|
181
|
+
end
|
|
182
|
+
|
|
183
|
+
|
|
184
|
+
|
|
185
|
+
def show
|
|
186
|
+
|
|
187
|
+
# @userにUserテーブルのidが受け取った値である(params[:id])のレコードを見つけて代入
|
|
188
|
+
|
|
189
|
+
@user = User.find(params[:id])
|
|
190
|
+
|
|
191
|
+
@first_day = Date.current.beginning_of_month
|
|
192
|
+
|
|
193
|
+
@last_day = @first_day.end_of_month
|
|
194
|
+
|
|
195
|
+
end
|
|
196
|
+
|
|
197
|
+
|
|
198
|
+
|
|
199
|
+
def create
|
|
200
|
+
|
|
201
|
+
@user = User.new(user_params)
|
|
202
|
+
|
|
203
|
+
if @user.save
|
|
204
|
+
|
|
205
|
+
log_in @user # 保存成功後、ログインします。
|
|
206
|
+
|
|
207
|
+
flash[:success] = '新規作成に成功しました。'
|
|
208
|
+
|
|
209
|
+
redirect_to @user
|
|
210
|
+
|
|
211
|
+
else
|
|
212
|
+
|
|
213
|
+
render :new
|
|
214
|
+
|
|
215
|
+
end
|
|
216
|
+
|
|
217
|
+
end
|
|
218
|
+
|
|
219
|
+
|
|
220
|
+
|
|
221
|
+
|
|
222
|
+
|
|
223
|
+
def edit
|
|
224
|
+
|
|
225
|
+
@user = User.find(params[:id])
|
|
226
|
+
|
|
227
|
+
end
|
|
228
|
+
|
|
229
|
+
|
|
230
|
+
|
|
231
|
+
def update
|
|
232
|
+
|
|
233
|
+
@user = User.find(params[:id])
|
|
234
|
+
|
|
235
|
+
if @user.update_attributes(user_params)
|
|
236
|
+
|
|
237
|
+
flash[:success] = "ユーザー情報を更新しました"
|
|
238
|
+
|
|
239
|
+
redirect_to @user
|
|
240
|
+
|
|
241
|
+
else
|
|
242
|
+
|
|
243
|
+
render :edit
|
|
244
|
+
|
|
245
|
+
end
|
|
246
|
+
|
|
247
|
+
end
|
|
248
|
+
|
|
249
|
+
|
|
250
|
+
|
|
251
|
+
private
|
|
252
|
+
|
|
253
|
+
|
|
254
|
+
|
|
67
|
-
def e
|
|
255
|
+
def user_params
|
|
256
|
+
|
|
257
|
+
params.require(:user).permit(:name, :email, :password, :password_Confirmation)
|
|
258
|
+
|
|
259
|
+
end
|
|
68
260
|
|
|
69
261
|
end
|
|
70
262
|
|
|
263
|
+
|
|
264
|
+
|
|
265
|
+
|
|
266
|
+
|
|
267
|
+
end
|
|
268
|
+
|
|
71
269
|
```
|
|
72
270
|
|
|
73
271
|
|