caboose-cms 0.2.84 → 0.2.85

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTZiMjFhZjc3NmE2NmRhMjQ4NTMxZDJiNzM5MDdiZDg5MzZkOTU5Mg==
+    NGYxODhjNTkxNzJjNGYzYTFhZmIwNGZjMTdhOTgwYmUxMDhjOWU4Zg==
   data.tar.gz: !binary |-
-    YmFiMGViZmU4M2I4Y2Y4MTlkNjFjMWViYmU0NzY4MTdjZjBlMzc1Mw==
+    MjFmYzFhZDVkMThlNTU5ODA4ZmI1NzNlYzRmYjRiOTVjNGU4ZjdhOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDg1ODFkZTFkZTRmNTYxYWQ2YWU2Y2YwYjE4NjJkMmY5NDU5NjE2ZDc1Njcw
-    MjFjNWE5ZmI5M2M0ZjlhNDNlYTcyNmRkODk1MzM2ZDRlYTJhNDllNzY2YmZi
-    ZDg3OWY3NjU3ZWFlN2I0YmIzY2RhMTI3Y2U3NzlmNjRjZTAzZTI=
+    YmQ4ZWFhNTc1MjI2MDc1MjM2ZGQwNzBhYmZhMjVjNjEyNzNmMjJmNDk4YTlj
+    MjE1ODM1NWM3MTM4ZWQ2YTVjYTlkNTUyNWYyYTA1YjdlOTU3N2M3M2U2MjNm
+    NDk5OGJkYTNkNWE1Y2JkYmMxMTAyYmZhNmFhZDhhODg4ODkxODU=
   data.tar.gz: !binary |-
-    MjhhYzZkYTVkNDRlNmJhN2U1MWQ4ODdlMGY2YjBhNmVmZGFmOTJmMWFkNzI3
-    M2VmYjdlN2RhZWM1MDQwZGZhM2I5MTQ2ZTExNjQ4YzM4ZWJkM2M5ZTgwOTY2
-    NDk5NWM1MDEzNjZiNzI1OGU2YzlmMmQyNWZmYWJiMTRlY2ZlNjI=
+    MmY0ODM1MzQ2NmJkZmQ5YzZlZGEyZjMxM2IzMGE4ZmNiYTNlNzYwMDcwNDc3
+    ZTQxZDhlNjAwNDg5MmUwNjFlMDM3OTk3ZTI2NDcyYjE2MzJhODExMmY5ODgw
+    ZWQ4ZWJiOGUzMDlhNDBiZmM3YzVmM2NiYTkzMjg4NjdiMmUxZDQ=

data/app/models/caboose/page_bar_generator.rb

@@ -61,9 +61,11 @@ module Caboose
       return true
   	end
   	
-  	def items  	    	  
-    	#return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
-    	return @options['model'].constantize.where(where).limit(limit).offset(offset).reorder(reorder).all
+  	def items
+    	assoc = @options['model'].constantize.where(where)
+    	if @options['items_per_page'] != -1
+    	  assoc = assoc.limit(limit).offset(offset)
+    	return assoc.reorder(reorder).all
   	end
   		
   	def generate

data/app/views/caboose/permissions/edit.html.erb

@@ -1,19 +1,27 @@
  
 <h1>Edit Permission</h1>
-<div id='permission_<%= @permission.id %>_container'></div>
+<div id="permission_<%= @permission.id %>_resource"></div>
+<div id="permission_<%= @permission.id %>_action2"></div>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
+var modal = false;
+$(window).load(function() {
+    modal = new CabooseModal(600,600);
+});
+
 $(document).ready(function() {
-  var permission = new Model({
+  m = new ModelBinder({
     name: 'Permission',
     id: <%= @permission.id %>,
     listing_url: 'get /admin/permissions',
     update_url: 'put /admin/permissions/<%= @permission.id %>',
     delete_url: 'delete /admin/permissions/<%= @permission.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'resource' , type: 'text', value: "<%= @permission.resource %>" },
+      { name: 'resource' , type: 'text', value: "<%= @permission.resource %>", nice_name: "Resource" },
       { name: 'action2'  , type: 'text', value: "<%= @permission.action   %>", nice_name: 'Action' }
     ]
   });

data/app/views/caboose/users/edit_password.html.erb

@@ -5,7 +5,7 @@
 <div id='message'></div>
 <div id='controls'>
 <input type='button' value='Back' onclick="window.location='/admin/users/<%= @edituser.id %>/edit';" />
-<input type='button' value='Update Password' onclick="udpatePassword();" />
+<input type='button' value='Update Password' onclick="updatePassword();" />
 </div>
 
 <% content_for :caboose_js do %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.84'
+  VERSION = '0.2.85'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.84
+  version: 0.2.85
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails