Commit Graph

30 Commits

Author SHA1 Message Date
鳥井 雪
aa0e68d653 Refactor #set_locale in applicaiton_controller
by dividing the method to 3 methods each decides locales from given conditions.
2015-01-14 14:24:00 +09:00
Kouhei Sutou
f5c0aaf8f2 Converge codes for user name restriction
The current implementation accepts only "admin" user. Codes for the
restriction exist in several files.

This change converges codes for the restriction to
app/models/user.rb. This change will be helpful when we support more
user names.
2014-09-25 15:55:19 +09:00
Kouhei Sutou
ab903716bc Try to fix wrong try usage
`Object#try` checks "whether receiver is nil or not". It doesn't rescue
any exceptions raised in method call.

    > User.new(name: "admin", password_digest: "invalid-hash").authenticate("X")
    BCrypt::Errors::InvalidHash: invalid hash
            from /var/lib/gems/2.1.0/gems/bcrypt-3.1.7/lib/bcrypt/password.rb:60:in `initialize'
            ...
2014-08-19 21:21:35 +09:00
Kouhei Sutou
8e8c95fce3 in_tail: Fix error on setting page for binary file
How to reproduce:

  * Create a binary file by the following command:

        "ruby -e 'puts "\u3042"' > /tmp/xxx"

  * Open /daemon/setting/in_tail
  * Select "/tmp/xxx"
  * Error page is rendered
  * log/production.log says:

        ActionView::Template::Error (undefined method `join' for nil:NilClass):
            12:     = f.text_field :path, class: "form-control", disabled: true
            13:   = render partial: "shared/vue/in_tail_format", locals: { file: f.object.path, formats: @setting.known_formats, initialSelected: f.object.format || @setting.guess_format }
            14:
            15:   %pre= file_tail(@setting.path).join("\n")
            16:
            17:   %p
            18:     = f.submit t('terms.next'), class: "btn btn-lg btn-primary pull-right"
          app/views/fluentd/settings/in_tail/after_file_choose.html.haml:15:in `block in _app_views_fluentd_settings_in_tail_after_file_choose_html_haml___1713159989942914940_40548520'
2014-08-06 17:34:23 +09:00
uu59
1d5ad1f31e Add comment why using try method 2014-07-31 17:17:14 +09:00
uu59
93e1998016 Controller methods to be private 2014-07-31 17:17:14 +09:00
uu59
260a12e375 Add notation for permission on in_tail setting page 2014-07-30 16:02:56 +09:00
uu59
3ada1f874c Switching brand name with ENV 2014-07-24 16:03:45 +09:00
uu59
2aa6b05f4b Some controller methods to lib/ 2014-07-08 13:26:51 +09:00
uu59
babb3df89c Remove debug code 2014-07-04 18:28:19 +09:00
uu59
25dda76174 Restart fluentd-ui process with fluentd-ui 2014-07-04 12:51:14 +09:00
uu59
568c7620b6 Fix to hide some sidebnav links if fluentd not registered yet 2014-07-02 11:06:18 +09:00
uu59
482aeebc4a Refactoring: Fluentd#factory -> Fluentd#instance 2014-06-27 14:12:01 +09:00
uu59
0b2e12e221 Fix if stored password hash is invalid 2014-06-19 17:33:11 +09:00
uu59
81acdd9067 Refactoring 2014-06-19 17:32:53 +09:00
uu59
81600a2ba4 Remove ActiveRecord from User and RememeberToken 2014-06-19 16:28:34 +09:00
uu59
8a67f00a17 Add roughly format and format options for in_tail setup pages 2014-06-17 15:08:58 +09:00
uu59
51d7bf3309 don't redirect if not signed in request via Ajax 2014-06-03 15:43:22 +09:00
uu59
c8e565defd Plugin working queue is managed by Plugin model 2014-05-30 13:31:09 +09:00
uu59
1f1cb60c5c Refactoring 2014-05-29 15:08:33 +09:00
uu59
488a0d8a59 Add polling alerts point on rails 2014-05-29 14:18:46 +09:00
uu59
53f2782c52 Fix language menu to languege context free 2014-05-28 15:15:19 +09:00
uu59
b9405fd937 Add locale switcher, by query parameter(?lang=xx) or Accept-Language header 2014-05-27 18:18:29 +09:00
uu59
fc9dfb167d Add basically config edit 2014-05-26 13:16:03 +09:00
uu59
0d4db20ec0 Fix login check 2014-05-22 13:35:24 +09:00
uu59
54d3e6c95c Multi clients can login by same user 2014-05-22 13:21:32 +09:00
uu59
e19ce05525 Add sign out 2014-05-13 17:02:32 +09:00
uu59
19b0e591a1 Add login_required for exists controllers 2014-05-13 17:02:32 +09:00
uu59
508956f3b4 Add sign in process 2014-05-13 16:58:52 +09:00
uu59
9c19a42528 rails new ./fluentd-ui -T -D 2014-05-08 15:53:16 +09:00