Skip to content

Commit d5c6e5c

Browse files
committed
fix user passwd set bug
1 parent d1f7798 commit d5c6e5c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

app/controllers/system/roles/users/edit.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ export default Ember.Controller.extend({
4040
var self = this;
4141
var user = this.get('model');
4242
user.set('isReady', false);
43+
if (this.get('passwd')) {
44+
user.set('passwd', this.get('passwd'));
45+
}
4346
var promise = user.save();
4447
promise.then(function(){
4548
self.transitionToRoute("system.roles.users");

app/templates/tools/stats.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</div>
4747
</div>
4848
</div>
49-
<div id="uptime" class="seven wide column">
49+
<div id="uptime" class="six wide column">
5050
<h2><i class="clock icon"></i> Uptime</h2>
5151
<div class="ui statistics">
5252
<div id="uptime-days" class="ui statistic">
@@ -67,7 +67,7 @@
6767
</div>
6868
</div>
6969
</div>
70-
<div class="two wide column">
70+
<div class="three wide column">
7171
<h2><i class="sun icon"></i> Temp</h2>
7272
<div class="ui statistics">
7373
<div id="temp" class="ui statistic">

0 commit comments

Comments
 (0)