bookingsync_portal 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab83431a462646ae92b55367aa850ea6fe361cc2
-  data.tar.gz: b104c6d7b237f1a56878a9df5cea6c86b891d32d
+  metadata.gz: 9a480ce2459ec1089601197319ee60201436263d
+  data.tar.gz: e282f8169d93c61ae942716c5fb2bb31a9790bc7
 SHA512:
-  metadata.gz: a2f667d2324d7f67c8228cc1413692d73acda17e20640c71edd652b8517e8d4f395ef9be3d79aea2c5b488d2a857835af4e0d5b3f1d9c3962119e6a278cabc38
-  data.tar.gz: e3441d437d0ae5f9c1a7a1c43e7b6a91ca8a695e19909e4b2a963fc965312766e4a6c63913b2487e1362ad3742448e311ef20fb2e1f3b75322cd88e17c2ba076
+  metadata.gz: 695f61dd565e424616ba9f16792146fea0212de4185b512f9916a52a6c0bc7afd8b3bb16834b2d2efcfd0de81d19d0ab5e8fefe09beb367b63d3953be5dfe1a9
+  data.tar.gz: 529f1ee3232b275d0585bab5ed511a1d26093d358f43fa22ef7bcd4e7e6fe785c5946cb0fbea2435b266ddeb7e32f1b4361e38390f12b990415d4acc63610f04

data/app/assets/javascripts/bookingsync_portal/admin/list_filters.js

@@ -32,12 +32,13 @@
   };
 
 
-  function listFilter(header, list) { // header is any element, list is an unordered list
+  function listFilter(header, list, input_id) { // header is any element, list is an unordered list
     // create and add the filter form to the header
-    var form = $("<form>").attr({"class":"filterform","action":"#"}),
-        label = $("<label>Filter by name:</label>"),
-        input = $("<input>").attr({"class":"filterinput","type":"text"});
-    $(form).append(label).append(input).appendTo(header);
+    var form = $("<form>").attr({"class":"filterform form-inline","action":"#"}),
+        form_group = $("<div>").attr({"class":"form-group form-group-sm"}),
+        label = $("<label>Filter by name:</label>").attr({"class":"control-label","for":input_id}),
+        input = $("<input>").attr({"class":"filterinput form-control","type":"text","id":input_id});
+    $(form).append(form_group.append(label).append(input)).appendTo(header);
 
     $(input)
       .change( function () {
@@ -57,9 +58,10 @@
 
   //ondomready
   $(function () {
-    listFilter($(".bookingsync-rentals-list .rentals-list-header legend"), $(".bookingsync-rentals-list .rentals-list-scroll"));
+    listFilter($(".bookingsync-rentals-list .rentals-list-header legend"),
+      $(".bookingsync-rentals-list .rentals-list-scroll"), "bookingsync_filter");
     $(".remote-rentals-list .rentals-list-header").each(function(index, element) {
-      listFilter($(element).find("legend"), $(element).next());
+      listFilter($(element).find("legend"), $(element).next(), "remote_filter_" + index);
     });
   });
 }(jQuery));

data/app/assets/stylesheets/bookingsync_portal/admin/_list_filters.scss

@@ -1,8 +1,8 @@
-legend {
-  form {
-    font-size: small;
-    label {
-      margin-right: 10px;
-    }
+.filterform {
+  margin-bottom: 5px;
+  font-size: small;
+
+  label {
+    margin-right: 10px;
   }
 }

data/app/controllers/bookingsync_portal/admin/rentals_controller.rb

@@ -5,8 +5,8 @@ module BookingsyncPortal
       before_action :fetch_remote_rentals, only: :index
 
       def index
-        @not_connected_rentals = current_account.rentals.ordered.not_connected
-        @rentals = current_account.rentals.ordered
+        @not_connected_rentals = current_account.rentals.visible.ordered.not_connected
+        @visible_rentals_count = current_account.rentals.visible.count
         @remote_accounts = current_account.remote_accounts
         @remote_rentals_by_account = current_account.remote_rentals.ordered
           .includes(:remote_account).group_by(&:remote_account)
@@ -47,7 +47,7 @@ module BookingsyncPortal
       end
 
       def rental
-        @rental ||= current_account.rentals.find(params[:id])
+        @rental ||= current_account.rentals.visible.find(params[:id])
       end
 
       def redirect_or_js_response

data/app/models/bookingsync_portal/remote_rental.rb

@@ -10,7 +10,7 @@ class BookingsyncPortal::RemoteRental < ActiveRecord::Base
 
   serialize :remote_data, BookingsyncPortal::MashSerializer
 
-  validates :uid, presence: true, uniqueness: true
+  validates :uid, uniqueness: { allow_nil: true }
   validates :remote_account, presence: true
 
   scope :ordered, -> { order(created_at: :desc) }

data/app/models/bookingsync_portal/rental.rb

@@ -5,9 +5,12 @@ class BookingsyncPortal::Rental < ActiveRecord::Base
   has_one :connection, class_name: BookingsyncPortal.connection_model, dependent: :destroy
   has_one :remote_rental, class_name: BookingsyncPortal.remote_rental_model, through: :connection
 
+  validates :synced_id, uniqueness: true, presence: true
+
   scope :ordered, -> { order(position: :asc) }
   scope :connected, -> { joins(:remote_rental) }
   scope :not_connected, -> { includes(:connection).where(connections: { remote_rental_id: nil }) }
+  scope :visible, -> { all }
 
   def connected?
     remote_rental.present?

data/app/views/bookingsync_portal/admin/rentals/index.html.erb

@@ -4,7 +4,7 @@
       <legend><%=t '.bookingsync_header', account_name: current_account.name %></legend>
     </div>
     <div class="rentals-list-scroll">
-      <%- if @rentals.count == 0 -%>
+      <%- if @visible_rentals_count == 0 -%>
         <div class="lead text-center well">
           <p><%= t('.no_published_rentals_html', id: current_account.uid) %></p>
         </div>

data/lib/bookingsync_portal/version.rb

@@ -1,3 +1,3 @@
 module BookingsyncPortal
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookingsync_portal
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Piotr Marciniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails