Merge branch 'develop' into f_mapper

Resolved by deleting sprockets manifesto and precompiling production
assets

Bowerfile

@@ -1,8 +1,8 @@
-asset 'angular', "1.4.10"
-asset 'angular-route', "1.4.10"
-asset 'angular-resource', "1.4.10"
-asset 'angular-messages', "1.4.10"
-asset 'angular-animate', "1.4.10"
+asset 'angular', "1.4.14"
+asset 'angular-route', "1.4.14"
+asset 'angular-resource', "1.4.14"
+asset 'angular-messages', "1.4.14"
+asset 'angular-animate', "1.4.14"
 asset 'bootstrap-sass-official'
 asset 'angular-bootstrap'
 asset 'angular-ui-sortable'

app/assets/javascripts/lib/data_manager/auth/users.coffee

@@ -10,6 +10,11 @@ users.factory(
         'users/admin/:id.json',
         {
           id: '@id'
+        },
+        {
+          save: {method: 'PUT'},
+          create: {method: 'POST'}
+          reset_password: {method: 'POST', url: 'users/admin/:id/password.json'}
         }
       )
   ])

app/assets/javascripts/lib/realtime.coffee

@@ -23,6 +23,8 @@ realtime.factory('RealTimeConnection',
 
       service.socket.on 'rt-update', (message)->
         $rootScope.$emit('rt-update', message)
+
+      console.log service
       service
   ]
 )

app/assets/javascripts/lib/resource.coffee

@@ -23,6 +23,7 @@ resource.factory('WrappedResource', [ '$resource', ($resource)->
     )
 
     @resource::save = (params, success, error)->
+      console.trace()
       if @id?
         @$save(params, success, error)
       else

app/assets/javascripts/sections/admin/index.coffee

@@ -46,8 +46,9 @@ admin.controller('AdminDashController',
 admin.controller('AdminUsersController',
   [
     '$scope',
-    'DataManager'
-    ($scope, DataManager)->
+    'DataManager',
+    'Flash'
+    ($scope, DataManager, Flash)->
       DataManager.getUsers()
       $scope.groups = DataManager.Data.Groups
       $scope.users = []
@@ -76,6 +77,7 @@ admin.controller('AdminUsersController',
         $scope.original = null
         $scope.current = new DataManager.Auth.Users.resource()
         $scope.mode = 'user'
+        $scope.users = []
         $scope.editing = true
 
       $scope.addStudy = ->
@@ -100,14 +102,26 @@ admin.controller('AdminUsersController',
         if $scope.original?
           angular.copy $scope.current, $scope.original
         else
-          (if $scope.mode == 'group' then $scope.groups else DataManager.Data.Users).push $scope.current
+          if $scope.mode == 'group'
+            $scope.groups.push $scope.current
+          else
+            DataManager.Data.Users.push $scope.current
+            DataManager.GroupResolver.resolve()
+
           $scope.original = $scope.current
         $scope.original.save(
           {},
-          ->
+          (a, b, c, d, e)->
             $scope.editing = false
+          ,->
+            $scope.original = null
+            Flash.add 'danger', 'Could not save '+ $scope.mode + '.'
         )
 
+      $scope.reset_password = ->
+        console.log $scope
+        $scope.current.$reset_password()
+
       $scope.delete = ->
         arr = if $scope.mode = 'group' then $scope.groups else DataManager.Data.Users
         index = arr.indexOf $scope.current

app/assets/javascripts/templates/partials/admin/users.html

@@ -189,6 +189,7 @@ <h1 class="page-header">
                             >
                                 {{current.status == 'locked' ? 'Unlock' : 'Lock'}}
                             </button>
+                            <button class="btn btn-danger" data-ng-show="!editing" data-ng-click="reset_password()">Reset Password</button>
                             <button class="btn btn-warning" data-ng-show="!editing && current.status == 'unconfirmed'" data-ng-click="edit()">Confirm</button>
                             <button class="btn btn-default" data-ng-show="editing" data-ng-click="cancel()">Cancel</button>
                             <button class="btn btn-primary" data-ng-show="editing" data-ng-click="save()">Save</button>

app/controllers/users/admin_controller.rb

@@ -9,28 +9,39 @@ def show
   end
 
   def create
-    @user = User.new safe_params
-    logger.debug @user.to_json
-    if @user.save!
+    @object = User.new safe_params
+    logger.debug @object.to_json
+    if @object.save!
       render :show, status: :created
     else
       render json: user.errors, status: :unprocessable_entity
     end
   end
 
   def update
-    @user = User.find safe_params['id']
-    if @user.update safe_params.select {|k,v| ['first_name', 'last_name', 'role'].include?(k)}
+    @object = User.find safe_params['id']
+    if @object.update safe_params.select {|k,v| %w(first_name last_name role).include?(k)}
       render :show, status: :ok
     else
       render json: user.errors, status: :unprocessable_entity
     end
   end
 
+  def reset_password
+    @object = User.find safe_params['id']
+    @object.send_reset_password_instructions
+
+    if @object.errors.empty?
+      head :ok
+    else
+      render json: @object.errors, status: :unprocessable_entity
+    end
+  end
+
   def destroy
     begin
-      @user = User.find safe_params['id']
-      @user.destroy
+      @object = User.find safe_params['id']
+      @object.destroy
       head :ok
     rescue
       head :bad_request

config/application.rb

@@ -32,8 +32,7 @@ class Application < Rails::Application
     config.autoload_paths += %W(#{config.root}/lib)
 
     config.enable_dependency_loading = true
-
-    config.action_mailer.delivery_method = (ENV['mailer'] || '').to_sym
+    config.action_mailer.delivery_method = (ENV['MAILER'] || '').to_sym
     config.action_mailer.postmark_settings = { api_token: ENV['POSTMARK_API_KEY'] }
     config.action_mailer.smtp_settings = {
         address:                ENV['SMTP_ADDRESS'],

config/routes.rb

@@ -12,7 +12,11 @@
       unlocks: 'users/unlocks',
   }
   namespace :users do
-    resources :admin, constraints: -> (r) { (r.format == :json) }
+    resources :admin, constraints: -> (r) { (r.format == :json) } do
+      member do
+        post 'password', to: 'admin#reset_password'
+      end
+    end
   end
   root 'main#index'