tb_core 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c34ea80001648010e043bef02b72692915420f
-  data.tar.gz: 3883316c2ffaa12dd1dd898f3b96a018b58441fd
+  metadata.gz: f90c1e3395d45e3a5e48b296d5176c88dd3701ab
+  data.tar.gz: 6425455e234a5ccadc3fcc38f668578de9ba90c3
 SHA512:
-  metadata.gz: ce061063bbbe493d0371ce8a1f3eba01091a2ee8c4d35a77d47afa5e8431f6c40c39f2f93b4a4c7f442cf317951696a5640f80b7f90565e1f039c04c0064398a
-  data.tar.gz: 378b935cdabc307ec286995fc2b7f77a1dc18fe482a9c1790685a0bc12bccb07e976f57728e3cf3131c256d05ec9c3881471e0ab13751d6179c4618721b1f388
+  metadata.gz: ce5ec2edd76b476e08e23d2b2129bdae35b285a448ca372c490dc09efdc7043b5779f5f94054775079f0c0b93fd23ab96777ae2938cdb8f97b7e39ebf9b60f8b
+  data.tar.gz: 77e0e1dd611e1d6d9e44fadb0b234d86787dba522c993a390f81e0d03319a9d042fd7d78ad3a1fbeb8d1fb923cc7f8cf6f43bd34b7ce085f4102eb16f087fc32

data/app/assets/javascripts/admin/core/application.js

@@ -1,6 +1,5 @@
 //= require jquery
 //= require jquery_ujs
-//= require admin/core/preinit
 //= require tinymce-jquery
 //= require tinymce/plugins/tableDropdown/editor_plugin
 //= require bootstrap/js/bootstrap
@@ -9,7 +8,6 @@
 //= require ../../tb_core
 //= require_self
 //= require_tree .
-//= require retina_tag
 
 spud = {admin:{}};
 
@@ -17,104 +15,35 @@ $(document).ready(function() {
 
   spud.admin.editor.init();
 
-    $("#modal_window .modal-footer .form-submit").bind('click', function() {
-      $("#modal_window .modal-body form").submit();
-    });
-
-    $("#modal_window ").on('hidden', function(){
-      $(this).find('.modal-footer-additional').remove();
-      $(this).find('.modal-footer-default').show();
-      $(this).removeData('modal');
-    });
-
-    $('body').on('click', 'a.ajax', function() {
-      var url = this.href;
-      var title = this.title;
-      var dialog = $("#modal_window");
-
-      $("#modal_window .modal-title").text(title);
-      dialog.modal({
-        remote: url +".js",
-        show:true
-      });
-
-      // dialog.load(url + ".js",
-      // function(responseText, textStatus, XMLHttpRequest) {
-      //   dialog.dialog({width:500,modal:true,height:500,title:title});
-      // });
-      return false;
+  $("#modal_window .modal-footer .form-submit").bind('click', function() {
+    $("#modal_window .modal-body form").submit();
+  });
+
+  $("#modal_window ").on('hidden', function(){
+    $(this).find('.modal-footer-additional').remove();
+    $(this).find('.modal-footer-default').show();
+    $(this).removeData('modal');
+  });
+
+  $('body').on('click', 'a.ajax', function() {
+    var url = this.href;
+    var title = this.title;
+    var dialog = $("#modal_window");
+
+    $("#modal_window .modal-title").text(title);
+    dialog.modal({
+      remote: url +".js",
+      show:true
     });
 
+    return false;
+  });
 
-    $('body').on('ajax:success', 'a[data-method="delete"]',
-      function(data, textStatus, jqXHR){
-        $(this).closest('tr').fadeOut();
-    });
-
-
-      $('a.button').button();
+  $('a.button').button();
 
+  $('input[type=submit].btn').click(function() {$(this).button('loading');});
 
-      $('input[type=submit].btn').click(function() {$(this).button('loading');});
-
-    $('#multisite_switcher select').change(function() {
-      $(this).parent().submit();
-    });
-
+  $('#multisite_switcher select').change(function() {
+    $(this).parent().submit();
+  });
 } );
-
-
-function remove_fields(link) {
-  $(link).prev("input[type=hidden]").val("1");
-  $(link).closest(".fields").hide();
-}
-
-function add_fields(link, association, content) {
-  var new_id = new Date().getTime();
-  var regexp = new RegExp("new_" + association, "g")
-  $(link).parent().before(content.replace(regexp, new_id));
-}
-
-
-
-
-function initTinyMCE(selector) {
-  console.warn('Deprecation Notice: `initTinyMCE()` is deprecated, please use `spud.admin.editor.init()` instead.');
-  spud.admin.editor.init();
-}
-
-function initDatePicker(selector){
-  console.warn('Deprecation Notice: `initDatePicker()` is deprecated, please use `spud.admin.date_picker.init()` instead.');
-  spud.admin.date_picker.init();
-
-}
-
-function displayModalDialogWithOptions(options){
-  var modal = $('#modal_window');
-  if(options.title){
-    modal.find('.modal-title').text(options.title);
-  }
-  if(options.html){
-    modal.find('.modal-body').html(options.html);
-  }
-  var defaultFooter = modal.find('.modal-footer-default');
-  if(options.buttons){
-    var newFooter = defaultFooter.clone();
-    newFooter.addClass('modal-footer-additional');
-    newFooter.find('.form-submit').remove();
-    for(var key in options.buttons){
-      newFooter.append('<button class="btn '+key+'">'+options.buttons[key]+'</button>');
-    }
-    defaultFooter.hide();
-    modal.append(newFooter);
-  }
-  else{
-    defaultFooter.show();
-  }
-  modal.modal('show');
-}
-
-function hideModalDialog(){
-  var modal = $('#modal_window');
-  modal.modal('hide');
-}

data/app/assets/javascripts/admin/core/dashboard.js

@@ -1,27 +1,34 @@
 (function(){
 
+var badgeInterval;
+
 spud.admin.dashboard = {
   init:function(){
+    badgeInterval = setInterval(updateBadges, 30000);
     updateBadges();
-    setInterval(updateBadges, 30000);
   }
 };
 
-var updateBadges = function updateBadges() {
+var updateBadges = function() {
   var url = tb.util.urlFor('admin/badges');
   $.ajax({
     url: url
   }).always(function(json) {
     if(json && json.data) {
-      json.data.forEach(function(eachBadge) {
-        var id = "application_name_" + eachBadge.key;
-        updateBadge(id, eachBadge.badge_count);
-      });
+      if(json.data.length === 0){
+        clearInterval(badgeInterval);
+      }
+      else{
+        json.data.forEach(function(eachBadge) {
+          var id = "application_name_" + eachBadge.key;
+          updateBadge(id, eachBadge.badge_count);
+        });
+      }
     }
   });
 };
 
-var updateBadge = function updateBadge(badge_id, count) {
+var updateBadge = function(badge_id, count) {
   var badgeIcon = $('#' + badge_id).find('.dash_icon_badge');
   if(badgeIcon.length === 0) {
     return;

data/app/assets/javascripts/admin/core/modal.js

@@ -0,0 +1,47 @@
+(function(){
+
+spud.admin.modal = {
+
+  displayWithOptions: function(options){
+    var modal = $('#modal_window');
+    if(options.title){
+      modal.find('.modal-title').text(options.title);
+    }
+    if(options.html){
+      modal.find('.modal-body').html(options.html);
+    }
+    var defaultFooter = modal.find('.modal-footer-default');
+    if(options.buttons){
+      var newFooter = defaultFooter.clone();
+      newFooter.addClass('modal-footer-additional');
+      newFooter.find('.form-submit').remove();
+      for(var key in options.buttons){
+        newFooter.append('<button class="btn '+key+'">'+options.buttons[key]+'</button>');
+      }
+      defaultFooter.hide();
+      modal.append(newFooter);
+    }
+    else{
+      defaultFooter.show();
+    }
+    modal.modal('show');
+  },
+
+  hide: function(){
+    var modal = $('#modal_window');
+    modal.modal('hide');
+  }
+
+};
+
+})();
+
+function displayModalDialogWithOptions(options){
+  console.warn('displayModalDialogWithOptions() is deprecated, please use spud.admin.modal.displayWithOptions.');
+  spud.admin.modal.displayWithOptions(options);
+}
+
+function hideModalDialog(){
+  console.warn('hideModalDialog() is deprecated, please use spud.admin.modal.hide');
+  spud.admin.modal.hide();
+}

data/app/controllers/spud/application_controller.rb

@@ -91,12 +91,12 @@ private
     @exception = exception
     @exception.request_url = request.original_url
     respond_to do |format|
-      format.html{ 
-        template = @exception.template || Spud::Core.not_found_template
-        render :template => template, :layout => nil, :formats => [:html], :status => 404
-      }
       format.json{ render :json => {:errors => "The #{@exception.item} you were looking for could not be found."}, :status => 404 }
       format.xml{ render :xml => {:errors => "The #{@exception.item} you were looking for could not be found."}, :status => 404 }
+      format.all{
+        template = @exception.template || Spud::Core.not_found_template
+        render :template => template, :layout => nil, :formats => [:html], :status => 404, :content_type => 'text/html'
+      }
     end
   end
 

data/app/helpers/admin/application_helper.rb

@@ -23,18 +23,6 @@ module Admin::ApplicationHelper
     return style_str
   end
 
-  def link_to_remove_fields(name, f)
-    f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)",:class => "btn btn-danger")
-  end
-
-  def link_to_add_fields(name, f, association)
-    new_object = f.object.class.reflect_on_association(association).klass.new
-    fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
-      render(association.to_s.singularize + "_fields", :f => builder)
-    end
-    link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")",:class =>"btn")
-  end
-
   def error_messages_for(object)
     content = ""
     if object.errors.any?

data/app/models/spud/spud_user_model.rb

@@ -80,4 +80,17 @@ class Spud::SpudUserModel < ActiveRecord::Base
     return self.where('login like ? or concat(`first_name`, " ", `last_name`) like ?', like, like)
   end
 
+  # Return an array of users who have the requested permission
+  #
+  # * tag - Desired permission tag string (required)
+  # * include_supers - Whether to include super user (default: true)
+  def self.with_permission(tag, include_supers:true)
+    role_ids = SpudRolePermission.where(:spud_permission_tag => tag).pluck(:spud_role_id).uniq()
+    if include_supers
+      return SpudUser.where('super_admin = 1 OR spud_role_id IN (?)', role_ids)
+    else
+      return SpudUser.where(:spud_role_id => role_ids)
+    end
+  end
+
 end

data/lib/spud_core/engine.rb

@@ -1,5 +1,4 @@
 require 'jquery-rails'
-require 'retina_tag'
 require 'authlogic'
 require 'breadcrumbs_on_rails'
 require 'will_paginate'

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: retina_tag
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +302,6 @@ files:
 - Rakefile
 - app/assets/images/admin/down_arrow.gif
 - app/assets/images/admin/module_icon.png
-- app/assets/images/admin/module_icon@2x.png
 - app/assets/images/admin/up_arrow.gif
 - app/assets/images/admin/users_thumb.png
 - app/assets/javascripts/admin/application.js
@@ -324,6 +309,7 @@ files:
 - app/assets/javascripts/admin/core/dashboard.js
 - app/assets/javascripts/admin/core/date_picker.js
 - app/assets/javascripts/admin/core/editor.js
+- app/assets/javascripts/admin/core/modal.js
 - app/assets/javascripts/admin/core/preinit.js
 - app/assets/javascripts/admin/core/roles.js
 - app/assets/javascripts/admin/core/split_pane.js