metric_admin 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563e709e3eed279359a2edcb0d5848c723bdd179
-  data.tar.gz: 56906b5c54eef337958e036b568f8f1fcc9e8a2a
+  metadata.gz: f68c7616f3f2dc5bf976c9fc019416df385c48bc
+  data.tar.gz: a98d6e9957fd27814b0f32ad0341feb492616d8f
 SHA512:
-  metadata.gz: d2c9fb4fc5944b789fe5f3d5801acc8d78e3221b973dc459d072b99b4e8a5d10c28069de747fc5391b2d272bb81d48702f0276393fdc7dc91b3bafcb9f6ed0ee
-  data.tar.gz: 609e6b26e03fca3924d18c9fb80dd953dec5416466d64bd13c8542cd56b3a17acc12a7ff539a44e467e80f4c1562ffe750df95a94d6242bd9b14ea6b3cd1ae24
+  metadata.gz: 2f505cf785858e10e58957eed271540d29832ede2cd6c5e4811582d9ba80e8534c1aa851d3378ae47d9122f3b5f59adc7d409f2d556465f2875f10a028731509
+  data.tar.gz: ad53597fd5586ec5a762d68065b5f6236aa62a41e23af5464e88f05cfaa79015f82f67c20de242caab9b74258d289e2007f474ad537c0ba9f48233ad8e7171ea

data/README.md

@@ -133,7 +133,7 @@ Link the metric_admin.js and the metric_admin.css in the admin view in ```layout
 
 Also ensure that you have linked in the admin layout the lastest jquery.ui.min.js file.
 
-Ensure that the metric table has a public_sort column.
+Ensure that the metric table has a sort column.
 
 In the dashboard application modify ```app/models/metric.rb```
 

data/app/controllers/admin/metrics_controller.rb

@@ -54,7 +54,7 @@ module MetricAdmin
     def sort
       params[:metric].each_with_index do |metric_id, i|
         @metric = Metric.find(metric_id)
-        @metric.update_attribute(:public_sort, i)
+        @metric.update_attribute(:sort, i)
       end
       render :text => "sorted"
     end
@@ -63,7 +63,7 @@ module MetricAdmin
       @metric_to_clone = Metric.find(params[:id])
       @metric = @metric_to_clone.clone
       @metric.title = "Copy of #{@metric.title}"
-      @metric.public_sort = Metric.maximum(:public_sort, :conditions=>["resource_type_id = ?", @metric_to_clone.resource_type_id ]).to_i + 1
+      @metric.sort = Metric.maximum(:sort, :conditions=>["resource_type_id = ?", @metric_to_clone.resource_type_id ]).to_i + 1
       if @metric.save
         flash[:notice] = "#{@metric.title} has been cloned"
         redirect_to edit_admin_metric_url(@metric)

data/app/views/admin/metrics/edit.haml

@@ -39,7 +39,7 @@
                 .control-group
                   %label.control-label{:for => "title"} Sort order
                   .controls
-                    = f.text_field :sort, :value => @metric.public_sort.nil? ? @metric.resource_type.metrics.count : @metric.public_sort, :disabled => true, :class=>"span3"
+                    = f.text_field :sort, :value => @metric.sort.nil? ? @metric.resource_type.metrics.count : @metric.sort, :disabled => true, :class=>"span3"
 
               .span6
                 .row

data/app/views/admin/metrics/index.haml

@@ -18,7 +18,7 @@
               %h2.page-subtitle.pull-left= c.name
               = link_to "<i class='icon-plus icon-white'></i> Create a new #{c.name} metric", new_admin_metric_url(:resource_type_id => c), :class=>"btn btn-primary pull-right"
 
-            - metrics = Metric.all(:conditions=>["resource_type_id=?", c.id], :order => 'category ASC, public_sort ASC')
+            - metrics = Metric.all(:conditions=>["resource_type_id=?", c.id], :order => 'category ASC, sort ASC')
 
             - if metrics
               - metrics.group_by{|x| x.category }.each do |category, _metrics|

data/lib/metric_admin/version.rb

@@ -1,3 +1,3 @@
 module MetricAdmin
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metric_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Analytics For Lawyers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler