manage 1.3.13 → 1.3.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3382f506320cae9ecd2ff8eb79e475ac1dd8736d
4
- data.tar.gz: df3c0e4ddd9834f6a88614addbe456584ab1e37d
3
+ metadata.gz: 5dc03252a231e11b7954b53618ce720d940f3809
4
+ data.tar.gz: 676d8716213d12763892d7c255fd6687cd90df32
5
5
  SHA512:
6
- metadata.gz: 65fb1c2dff5458833eb4807bdf6fc379d774032481a09f05c2d45b3a267183a920ff7c1853ed540a3f99941e822da606b5c14c772b9578bd3c956c53733b0aa4
7
- data.tar.gz: d2ccda086b53c04e9180e43461ddb40df53a70ae7ed2565a39d6b7c2b69274943a9302dc986a46ea35607a6bf1f58ac55c1b558736d76c29115e2f630734e6a5
6
+ metadata.gz: b27042c1509ef948f36a87fb7520ab4cff59198ea476bc74809a4e33e8573b6a4372413533d4bd2c9016f878513caf5157ea0e890d6ee3f70719d823f5fb0121
7
+ data.tar.gz: 5c82b35617697739ea40fade351c1a7b4f43d0d0aa19d80acb11dec7399d747311ae9bbc8e78d98bd4ef4fc2ecfdb5a217e0c67aeea0b5081ebaeee22a006bb3
@@ -12,4 +12,13 @@ class Manage::AdminUsersController < Manage::ResourceController
12
12
  super
13
13
  end
14
14
 
15
+ def update
16
+ if params[:admin_user][:password].blank?
17
+ params[:admin_user].delete(:password)
18
+ params[:admin_user].delete(:password_confirmation)
19
+ end
20
+
21
+ super
22
+ end
23
+
15
24
  end
@@ -4,7 +4,7 @@ nav
4
4
  / = link_to 'index', collection_url
5
5
  = [ link_to(t('manage.actions.index', model: resource_class.model_name.human(count: 2)), resource.class, class: 'button small secondary'),
6
6
  resource_actions(resource),
7
- ].compact.join('&nbsp;'.html_safe)
7
+ ].compact.join('&nbsp;').html_safe
8
8
 
9
9
  .row
10
10
  .columns.large-6
@@ -1,3 +1,3 @@
1
1
  module Manage
2
- VERSION = "1.3.13"
2
+ VERSION = "1.3.14"
3
3
  end
@@ -0,0 +1,7 @@
1
+ module Manage
2
+ <<<<<<< HEAD
3
+ VERSION = "1.3.13"
4
+ =======
5
+ VERSION = "1.3.14"
6
+ >>>>>>> fccc76426b999631a6485a9a97a56da86bf238ce
7
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: manage
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.13
4
+ version: 1.3.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Empower United
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-01-16 00:00:00.000000000 Z
12
+ date: 2014-01-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -300,6 +300,7 @@ files:
300
300
  - lib/manage/engine.rb
301
301
  - lib/manage/fields/searcher.rb
302
302
  - lib/manage/fields/reader.rb
303
+ - lib/manage/version.rb.orig
303
304
  - lib/manage.rb
304
305
  - lib/tasks/manage_tasks.rake
305
306
  - lib/templates/erb/scaffold/_form.html.erb