Lock account #5564 #5643

aka001 · 2015-02-09T23:27:30Z

No description provided.

houndci-bot · 2015-02-09T23:27:33Z

app/controllers/admin/users_controller.rb

+  def lock_account
+    u = User.find(close_account_params)
+    u.lock_account!
+    redirect_to user_search_path, notice: t('admins.user_search.account_locking_scheduled', name: u.username)


Line is too long. [109/80]
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

aka001 · 2015-02-09T23:31:32Z

app/controllers/admin/users_controller.rb

@@ -7,6 +7,12 @@ def close_account
    redirect_to user_search_path, notice: t('admins.user_search.account_closing_scheduled', name: u.username)


@houndci Shall I change the single-quotes here into double-quotes ?

svbergerem · 2015-02-10T00:03:43Z

@aka001 We use houndci to check our javascript code. Apparently it also checks the ruby code. We were trying to disable checks for ruby but weren't successful so far. As long as those comments don't inform you about obvious errors you can just ignore them. We aren't enforcing a ruby code style right now.

houndci-bot · 2015-02-10T00:09:44Z

app/models/user.rb

@@ -456,6 +456,10 @@ def close_account!
    AccountDeletion.create(:person => self.person)
  end

+  def lock_account!
+    self = { :locked_at => Time.now }


cannot assign to a keyword

aka001 · 2015-02-10T00:15:30Z

@svbergerem Okay. I have updated the pr and squashed the commits. Thanks.

aka001 · 2015-02-10T00:21:26Z

app/views/admins/_user_entry.haml

@@ -24,6 +24,9 @@
        - unless user.person.closed_account
          %li= link_to t('admins.user_search.close_account'), admin_close_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure') }, class: 'btn btn-danger btn-mini'

+        - unless user.locked_at
+          %li= link_to t('admins.user_search.lock_account'), admin_close_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure_lock_account') }, class: 'btn btn-danger btn-mini'


I didn't get the use of "admin_close_account_path" which messed up the "lock account" option.
I used the command in main repository to figured out the use of the same:

grep -r "admin_close_account_path" .

but didn't get any result which details the same.
Please help me in figuring it out.

You might want to give http://guides.rubyonrails.org/routing.html a read then.

@jhass Thank you for the link. It helped a lot. I have taken the liberty to add the unlock feature.
When admin closes an user account it's "locked_at" field doesn't change, which results in "lock account"/"unlock account" option to be visible in admin's page.
Should we change the design to: "lock account/ unlock account" shouldn't be visible if the user account is locked?
I have attached the screenshot which reflects the same. The users "aka" and "aka_002" 's accounts are closed still the "Unlock Account" option is visible.

You should be able to use https://github.com/plataformatec/devise/blob/master/lib/devise/models/lockable.rb#L59

houndci-bot · 2015-02-18T11:42:37Z

app/controllers/admin/users_controller.rb

+  def unlock_account
+    u = User.find(close_account_params)
+    u.unlock_account!
+    redirect_to user_search_path, notice: t("admins.user_search.account_unlocking_scheduled", name: u.username)


Line is too long. [111/80]

jhass · 2015-02-18T11:49:23Z

@aka001 Looks like the rebase went a bit wrong. Let's try this:

git remote add upstream git:://github.com/diaspora/diaspora.git
git fetch upstream
git checkout 5564_lock_account
git rebase -i upstream/develop
# Drop the line with my commit
# Choose squash for the now second line
# Save & quit
# You'll be in some conflicts, git status shows them, once you cleaned them out use git add to mark them resolved, once all are resolved, use git rebase --continue, that might be needed more than one time
git push -f origin 5564_lock_account

# Later, you can edit the last commit with
git commit --amend
git push -f origin 5564_lock_account

Please also add at least one controller test per new route.

jhass · 2015-02-18T11:49:42Z

app/views/admins/_user_entry.haml

@@ -24,6 +24,11 @@
        - unless user.person.closed_account
          %li= link_to t('admins.user_search.close_account'), admin_close_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure') }, class: 'btn btn-danger btn-mini'

+        - unless user.locked_at
+          %li= link_to t('admins.user_search.lock_account'), admin_lock_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure_lock_account') }, class: 'btn btn-danger btn-mini'
+        - if user.locked_at


I think using else here would be clearer

aka001 · 2015-02-18T19:10:54Z

Updated

svbergerem · 2015-02-18T19:15:24Z

config/defaults.yml

    number: "head" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
+>>>>>>> develop


here is an unresolved conflict

@svbergerem Resolved. Thanks.

jhass · 2015-02-18T19:22:32Z

There's still a bogus commit in here and this is really fine in one commit, no need for 12. See #5643 (comment)

aka001 · 2015-02-18T19:47:10Z

I have squashed the commits.

jhass · 2015-02-18T20:59:44Z