v3.14.1

.rubocop.yml

@@ -181,7 +181,7 @@ Style/SpecialGlobalVars:
   Enabled: false
 
 Style/StringLiterals:
-  EnforcedStyle: single_quotes
+  EnforcedStyle: double_quotes
 
 Style/VariableInterpolation:
   Enabled: false

README.md

@@ -1,6 +1,6 @@
 # TimeOverflow
 [![View performance data on Skylight](https://badges.skylight.io/problem/grDTNuzZRnyu.svg)](https://oss.skylight.io/app/applications/grDTNuzZRnyu)
-[![Build Status](https://travis-ci.org/coopdevs/timeoverflow.svg)](https://travis-ci.org/coopdevs/timeoverflow)
+[![Build Status](https://travis-ci.com/coopdevs/timeoverflow.svg?branch=develop)](https://travis-ci.com/coopdevs/timeoverflow)
 [![Maintainability](https://api.codeclimate.com/v1/badges/f82c6d98a2441c84f2ef/maintainability)](https://codeclimate.com/github/coopdevs/timeoverflow/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/f82c6d98a2441c84f2ef/test_coverage)](https://codeclimate.com/github/coopdevs/timeoverflow/test_coverage)
 

app/admin/category.rb

@@ -1,6 +1,5 @@
 ActiveAdmin.register Category do
   index do
-    selectable_column
     id_column
     column :name, sortable: false
     actions
@@ -13,7 +12,7 @@
     f.actions
   end
 
-  show(title: :name) do |cat|
+  show do |cat|
     attributes_table do
       row :created_at
       row :updated_at

app/admin/document.rb

@@ -2,7 +2,6 @@
   permit_params *Document.attribute_names
 
   index do
-    selectable_column
     id_column
     column :documentable
     column :label

app/admin/organization.rb

@@ -39,7 +39,10 @@ def destroy
     end
   end
 
+  filter :id
   filter :name
+  filter :web
+  filter :phone
   filter :city, as: :select, collection: -> { Organization.pluck(:city).uniq }
   filter :neighborhood
 

app/admin/post.rb

@@ -1,12 +1,12 @@
 ActiveAdmin.register Post do
   index do
-    selectable_column
     id_column
     column :class
     column :title
     column :created_at do |post|
       l post.created_at.to_date, format: :long
     end
+    column :organization
     column :user
     column :category
     column :tag_list
@@ -15,23 +15,27 @@
 
   form do |f|
     f.semantic_errors *f.object.errors.keys
-    f.inputs "Admin Details" do
+    f.inputs do
       f.input :type, as: :select, collection: %w[Offer Inquiry]
       f.input :title
-      f.input :user
+      f.input :organization
+      f.input :user, hint: "* should be member of the selected organization"
       f.input :category
       f.input :description
       f.input :tag_list
+      f.input :active
     end
     f.actions
   end
 
   permit_params :type, :tag_list, *Post.attribute_names
 
   filter :type, as: :select, collection: -> { Post.subclasses }
+  filter :id
   filter :title
-  filter :user
   filter :organization
+  filter :user
   filter :category
+  filter :active
   filter :created_at
 end

app/admin/user.rb

@@ -32,13 +32,13 @@
 
   form do |f|
     f.semantic_errors *f.object.errors.keys
-    f.inputs "Admin Details" do
+    f.inputs do
       f.input :username
       f.input :email
       f.input :gender, as: :select, collection: User::GENDERS
       f.input :identity_document
     end
-    f.inputs "Members" do
+    f.inputs "Memberships" do
       f.has_many :members do |m|
         m.input :organization, collection: Organization.order(id: :asc).pluck(:name, :id)
         m.input :active

app/assets/javascripts/application/give_time.js

@@ -24,13 +24,12 @@ $( document ).ready(function () {
     }
 
     if ($(form).valid()) {
-      form.submit();
+      // submit the form via Rails-UJS to fire data-disable-with
+      Rails.fire(form, 'submit');
     }
   }
 
-  var config = {
+  $("#multi_transfer, #new_transfer").validate({
     submitHandler: submitHandler
-  };
-
-  $("#multi_transfer, #new_transfer").validate(config);
+  });
 })

app/models/account.rb

@@ -48,9 +48,6 @@ def add_organization
                         end
   end
 
-
-  private
-
   # Checks whether the balance falls within the max and min allowed balance,
   # none of these included
   #

app/views/transfers/new.html.erb

@@ -29,14 +29,22 @@
     <%= f.input :destination, as: :hidden %>
 
     <% if sources.present? %>
-      <%= render partial: 'sources', locals: { form: f, sources: sources, accountable: accountable } %>
+      <div class="form-group">
+        <%= f.label :source %>
+        <%= f.select :source,
+          options_for_select(
+            TransferSourcesOptions.new(sources).to_a,
+            selected: current_user.member(current_organization).account.id
+          ), {}, id: "select2", class: "form-control"
+        %>
+      </div>
     <% end %>
 
     <%= render partial: "#{accountable.model_name.singular}_offer", locals: { form: f, offer: offer, accountable: accountable } %>
   </div>
 
   <div class="form-actions">
-    <%= f.button :submit, class: "btn btn-default" %>
+    <%= f.button :submit, class: "btn btn-default", data: { disable_with: "..." } %>
     <label class="js-error-amount error invisible"><%= t ".error_amount" %></label>
   </div>
 <% end %>

config/initializers/active_admin.rb

@@ -6,6 +6,7 @@
   config.current_user_method = :current_user
   config.logout_link_path = :destroy_user_session_path
   config.logout_link_method = :delete
+  config.batch_actions = false
   config.comments = false
   config.namespace :admin do |admin|
     admin.build_menu :utility_navigation do |menu|