rails_admin_image_manager 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d5ccc15b634c41e00b328c52cfe89f56d698f5
-  data.tar.gz: 3f3025ca76da1db05efad353f2a45c7da0d7b3d2
+  metadata.gz: ce5292868f557c84909e5db795e5080722c679c5
+  data.tar.gz: fc6a76688fb37392583c18a4cedd39275a463f3a
 SHA512:
-  metadata.gz: 9fa75e7a44ae69cec259f9e97862e0eddacaf1d6a1ad32a8048266657519843f870e9a23fb3696b4b5b381b34e75e48832707131f4cd7378f42f0fdf914ae7b9
-  data.tar.gz: 603c50022cec6f353213d4df69d45da4fd98c7d2031ccdf46579fa63843787f6b50b7f48b48fb0a1c411b6787b7d44114212d77d7034c8533273106249d7e14b
+  metadata.gz: 2db417829eb63be80bb0b8592f7bf1f5d8c9c696ad6d116a292438e64f3ab7cbe6d9de022b57c2cc90b3f14ae3a4992efd4672c77199a09c57a3031e8213150b
+  data.tar.gz: de796a632d45e02734c7f3d2f1aa665488cfe84c7d2ea49000703311f0d1060579820326514e3ac000d576328da173c068066a2a56ab8d3a53158384cb286492

data/app/assets/javascripts/rails_admin_image_manager/app-compiled.js.erb

@@ -11605,8 +11605,15 @@
 	    name: 'createImage',
 	    component: _imageShow2.default,
 	    beforeEnter: function beforeEnter(to, from, next) {
+	      _stores2.default.dispatch('overlayStore/showProgressOverlay', true);
 	      _stores2.default.dispatch('mediasStore/clearCurrentImg');
-	      next();
+	      _stores2.default.dispatch('mediasStore/checkAddMediaPermission').then(function () {
+	        _stores2.default.dispatch('overlayStore/showProgressOverlay', false);
+	        next();
+	      }).catch(function () {
+	        _stores2.default.dispatch('overlayStore/showProgressOverlay', false);
+	        _stores2.default.dispatch('overlayStore/pushNotification', { error: true, msg: 'Vous n\'avez pas les permissions d\'ajouter un media' }, { root: true });
+	      });
 	    }
 	  }]
 	});
@@ -14775,7 +14782,7 @@
 	    };
 	  },
 
-	  computed: _extends({}, (0, _vuex.mapState)('mediasStore', ['imageListItems', 'maxImageListItems', 'tags', 'activeFilters'])),
+	  computed: _extends({}, (0, _vuex.mapState)('mediasStore', ['imageListItems', 'maxImageListItems', 'tags', 'activeFilters', 'readOnly'])),
 	  methods: {
 	    fetchImage: function fetchImage() {
 	      var _this2 = this;
@@ -32693,7 +32700,7 @@
 	    staticClass: "row"
 	  }, [_c('div', {
 	    staticClass: "col-sm-6"
-	  }, [_c('p', [_c('router-link', {
+	  }, [_c('p', [(!_vm.readOnly) ? _c('router-link', {
 	    staticClass: "btn btn-primary",
 	    attrs: {
 	      "to": {
@@ -32702,7 +32709,7 @@
 	    }
 	  }, [_c('i', {
 	    staticClass: "fa fa-plus"
-	  }), _vm._v(" Ajouter une image")]), _vm._v(" "), (_vm.searchedQuery || _vm.selectedFilter) ? _c('button', {
+	  }), _vm._v(" Ajouter une image")]) : _vm._e(), _vm._v(" "), (_vm.searchedQuery || _vm.selectedFilter) ? _c('button', {
 	    staticClass: "btn btn-default",
 	    on: {
 	      "click": _vm.resetSearchAndFilters
@@ -32728,7 +32735,7 @@
 	      staticClass: "img-options-content"
 	    }, [_c('h4', {
 	      staticClass: "h6 font-w400 text-white-op push-15"
-	    }, [_vm._v(_vm._s(image.name))]), _vm._v(" "), _c('router-link', {
+	    }, [_vm._v(_vm._s(image.name))]), _vm._v(" "), (!_vm.readOnly) ? _c('router-link', {
 	      staticClass: "btn btn-sm btn-default",
 	      attrs: {
 	        "to": {
@@ -32738,11 +32745,11 @@
 	          }
 	        }
 	      }
-	    }, [_vm._v("Modifier")]), _vm._v(" "), _c('image-insert-button', {
+	    }, [_vm._v("Modifier")]) : _vm._e(), _vm._v(" "), _c('image-insert-button', {
 	      attrs: {
 	        "id": image.id
 	      }
-	    }), _vm._v(" "), _c('a', {
+	    }), _vm._v(" "), (!_vm.readOnly) ? _c('a', {
 	      staticClass: "btn btn-sm btn-default",
 	      attrs: {
 	        "href": "javascript:void(0)"
@@ -32752,7 +32759,7 @@
 	          _vm.deleteImage(image)
 	        }
 	      }
-	    }, [_vm._v("Supprimer")])], 1)])])])
+	    }, [_vm._v("Supprimer")]) : _vm._e()], 1)])])])
 	  })) : _vm._e(), _vm._v(" "), (!_vm.grid) ? _c('div', {
 	    staticClass: "row items-push"
 	  }, [_c('div', {
@@ -32804,7 +32811,7 @@
 	      attrs: {
 	        "id": image.id
 	      }
-	    }), _vm._v(" "), _c('router-link', {
+	    }), _vm._v(" "), (!_vm.readOnly) ? _c('router-link', {
 	      staticClass: "btn btn-xs btn-default",
 	      attrs: {
 	        "to": {
@@ -32816,7 +32823,7 @@
 	      }
 	    }, [_c('i', {
 	      staticClass: "fa fa-edit"
-	    })]), _vm._v(" "), _c('a', {
+	    })]) : _vm._e(), _vm._v(" "), (!_vm.readOnly) ? _c('a', {
 	      staticClass: "btn btn-xs btn-default",
 	      attrs: {
 	        "href": "javascript:void(0)"
@@ -32828,7 +32835,7 @@
 	      }
 	    }, [_c('i', {
 	      staticClass: "fa fa-trash-o"
-	    })])], 1)])
+	    })]) : _vm._e()], 1)])
 	  }))])])]) : _vm._e(), _vm._v(" "), _c('div', {
 	    staticClass: "row text-center items-push"
 	  }, [_c('div', {
@@ -33533,6 +33540,7 @@
 	    currentImgSrc: "",
 	    currentImgTags: [],
 	    imageListItems: [],
+	    readOnly: false,
 	    maxImageListItems: -1,
 	    activeFilters: {
 	      tags: [],
@@ -33545,6 +33553,9 @@
 	    errors: {}
 	  },
 	  mutations: {
+	    UPDATE_READ_ONLY: function UPDATE_READ_ONLY(state, readOnly) {
+	      state.readOnly = readOnly;
+	    },
 	    UPDATE_CURRENT_IMG_ID: function UPDATE_CURRENT_IMG_ID(state, id) {
 	      state.currentImgId = id;
 	    },
@@ -33765,6 +33776,7 @@
 	          if (state.maxImageListItems == -1) commit('SET_MAX_IMAGE_LIST_ITEMS', response.data.total_count);
 	          // Calling mutation
 	          commit('ADD_TO_LIST_ITEMS', response.data.items);
+	          commit('UPDATE_READ_ONLY', response.data.readonly);
 
 	          // Hiding progess bar
 	          dispatch('overlayStore/showProgressOverlay', false, { root: true });
@@ -33784,12 +33796,14 @@
 	    },
 	    fetchSingleImage: function fetchSingleImage(_ref8, id) {
 	      var dispatch = _ref8.dispatch,
-	          rootDispatch = _ref8.rootDispatch;
+	          rootDispatch = _ref8.rootDispatch,
+	          commit = _ref8.commit;
 
 	      dispatch('overlayStore/showProgressOverlay', true, { root: true });
 	      return new Promise(function (resolve, reject) {
 	        _axios2.default.get('/images/' + id).then(function (response) {
-	          dispatch('setCurrentImg', response.data);
+	          commit('UPDATE_READ_ONLY', response.data.readonly);
+	          dispatch('setCurrentImg', response.data.image);
 	          dispatch('overlayStore/showProgressOverlay', false, { root: true });
 	          resolve();
 	        }).catch(function () {
@@ -33841,45 +33855,55 @@
 	        dispatch('overlayStore/pushNotification', { error: true, msg: 'Problème lors de la supression de l\'image' }, { root: true });
 	      });
 	    });
-	  }), _defineProperty(_actions, 'setSearchPage', function setSearchPage(_ref12, page) {
+	  }), _defineProperty(_actions, 'checkAddMediaPermission', function checkAddMediaPermission(_ref12) {
 	    var commit = _ref12.commit;
 
-	    commit('SET_PAGE', page);
-	  }), _defineProperty(_actions, 'setSearchQuery', function setSearchQuery(_ref13, query) {
+	    return new Promise(function (resolve, reject) {
+	      _axios2.default.get('/images/new').then(function () {
+	        resolve();
+	      }).catch(function () {
+	        reject();
+	      });
+	    });
+	  }), _defineProperty(_actions, 'setSearchPage', function setSearchPage(_ref13, page) {
 	    var commit = _ref13.commit;
 
+	    commit('SET_PAGE', page);
+	  }), _defineProperty(_actions, 'setSearchQuery', function setSearchQuery(_ref14, query) {
+	    var commit = _ref14.commit;
+
 	    commit('SET_QUERY', query);
-	  }), _defineProperty(_actions, 'toggleFilter', function toggleFilter(_ref14, type) {
-	    var commit = _ref14.commit,
-	        state = _ref14.state;
+	  }), _defineProperty(_actions, 'toggleFilter', function toggleFilter(_ref15, type) {
+	    var commit = _ref15.commit,
+	        state = _ref15.state;
 
 	    var term = state.activeFilters[type] == 'ASC' ? 'DESC' : 'ASC';
 	    commit('SET_FILTER', [term, type]);
-	  }), _defineProperty(_actions, 'clearImgListing', function clearImgListing(_ref15) {
-	    var commit = _ref15.commit;
+	  }), _defineProperty(_actions, 'clearImgListing', function clearImgListing(_ref16) {
+	    var commit = _ref16.commit;
 
 	    commit('CLEAR_IMG_LISTING');
-	  }), _defineProperty(_actions, 'updateSrc', function updateSrc(_ref16, src) {
-	    var commit = _ref16.commit,
-	        state = _ref16.state;
-
-	    commit('UPDATE_CURRENT_IMG_SRC', src);
-	  }), _defineProperty(_actions, 'addToTagFilter', function addToTagFilter(_ref17, id) {
+	  }), _defineProperty(_actions, 'updateSrc', function updateSrc(_ref17, src) {
 	    var commit = _ref17.commit,
 	        state = _ref17.state;
 
-	    commit('ADD_TO_TAG_FILTERS', id);
-	  }), _defineProperty(_actions, 'removeFromTagFilter', function removeFromTagFilter(_ref18, id) {
+	    commit('UPDATE_CURRENT_IMG_SRC', src);
+	  }), _defineProperty(_actions, 'addToTagFilter', function addToTagFilter(_ref18, id) {
 	    var commit = _ref18.commit,
 	        state = _ref18.state;
 
+	    commit('ADD_TO_TAG_FILTERS', id);
+	  }), _defineProperty(_actions, 'removeFromTagFilter', function removeFromTagFilter(_ref19, id) {
+	    var commit = _ref19.commit,
+	        state = _ref19.state;
+
 	    commit('REMOVE_FROM_TAG_FILTERS', id);
-	  }), _defineProperty(_actions, 'addTag', function addTag(_ref19, string) {
-	    var commit = _ref19.commit;
+	  }), _defineProperty(_actions, 'addTag', function addTag(_ref20, string) {
+	    var commit = _ref20.commit;
 
 	    commit('ADD_CURRENT_IMG_TAG', string);
-	  }), _defineProperty(_actions, 'removeTag', function removeTag(_ref20, string) {
-	    var commit = _ref20.commit;
+	  }), _defineProperty(_actions, 'removeTag', function removeTag(_ref21, string) {
+	    var commit = _ref21.commit;
 
 	    commit('REMOVE_CURRENT_IMG_TAG', string);
 	  }), _actions)

data/app/assets/javascripts/rails_admin_image_manager/components/imageListing.vue

@@ -9,7 +9,7 @@
         <div class="row">
           <div class="col-sm-6">
             <p>
-              <router-link class="btn btn-primary" :to="{ name: 'createImage'}"><i class="fa fa-plus"></i> Ajouter une image</router-link>
+              <router-link v-if="!readOnly" class="btn btn-primary" :to="{ name: 'createImage'}"><i class="fa fa-plus"></i> Ajouter une image</router-link>
               <button v-if="searchedQuery || selectedFilter" @click="resetSearchAndFilters" class="btn btn-default" ><i class="fa fa-undo"></i> Annuler la recherche</button>
             </p>
 
@@ -24,9 +24,9 @@
               <div class="img-options">
                 <div class="img-options-content">
                   <h4 class="h6 font-w400 text-white-op push-15">{{ image.name }}</h4>
-                  <router-link class="btn btn-sm btn-default" :to="{ name: 'showImage', params: { id: image.id }}">Modifier</router-link>
+                  <router-link v-if="!readOnly" class="btn btn-sm btn-default" :to="{ name: 'showImage', params: { id: image.id }}">Modifier</router-link>
                   <image-insert-button :id="image.id"/>
-                  <a class="btn btn-sm btn-default" @click="deleteImage(image)" href="javascript:void(0)">Supprimer</a>
+                  <a v-if="!readOnly" class="btn btn-sm btn-default" @click="deleteImage(image)" href="javascript:void(0)">Supprimer</a>
                 </div>
               </div>
             </div>
@@ -54,8 +54,8 @@
                   <td>{{ image.created_at | formatDate }}</td>
                   <td class="text-right">
                     <image-insert-button :id="image.id"/>
-                    <router-link class="btn btn-xs btn-default" :to="{ name: 'showImage', params: { id: image.id }}"><i class="fa fa-edit"></i></router-link>
-                    <a class="btn btn-xs btn-default" @click="deleteImage(image)" href="javascript:void(0)"><i class="fa fa-trash-o"></i></a>
+                    <router-link v-if="!readOnly" class="btn btn-xs btn-default" :to="{ name: 'showImage', params: { id: image.id }}"><i class="fa fa-edit"></i></router-link>
+                    <a v-if="!readOnly" class="btn btn-xs btn-default" @click="deleteImage(image)" href="javascript:void(0)"><i class="fa fa-trash-o"></i></a>
                   </td>
                 </tr>
               </tbody>
@@ -98,7 +98,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('mediasStore', ['imageListItems', 'maxImageListItems', 'tags', 'activeFilters'])
+    ...mapState('mediasStore', ['imageListItems', 'maxImageListItems', 'tags', 'activeFilters', 'readOnly'])
   },
   methods:{
     fetchImage() {

data/app/assets/javascripts/rails_admin_image_manager/router/index.js

@@ -38,8 +38,15 @@ let router = new Router({
       name: 'createImage',
       component: imageShow,
       beforeEnter: (to, from, next) => {
+        store.dispatch('overlayStore/showProgressOverlay', true)
         store.dispatch('mediasStore/clearCurrentImg')
-        next()
+        store.dispatch('mediasStore/checkAddMediaPermission').then(()=> {
+          store.dispatch('overlayStore/showProgressOverlay', false)
+          next()
+        }).catch(() => {
+          store.dispatch('overlayStore/showProgressOverlay', false)
+          store.dispatch('overlayStore/pushNotification', {error: true, msg: `Vous n'avez pas les permissions d'ajouter un media`}, {root:true})
+        })
       }
     }
   ]

data/app/assets/javascripts/rails_admin_image_manager/stores/medias.js

@@ -11,6 +11,7 @@ const mediasStore = {
     currentImgSrc: "",
     currentImgTags: [],
     imageListItems: [],
+    readOnly: false,
     maxImageListItems: -1,
     activeFilters: {
       tags: [],
@@ -23,6 +24,9 @@ const mediasStore = {
     errors: {}
   },
   mutations: {
+    UPDATE_READ_ONLY (state, readOnly) {
+      state.readOnly = readOnly
+    },
     UPDATE_CURRENT_IMG_ID (state, id) {
       state.currentImgId = id
     },
@@ -214,6 +218,7 @@ const mediasStore = {
           if(state.maxImageListItems == -1) commit('SET_MAX_IMAGE_LIST_ITEMS', response.data.total_count)
           // Calling mutation
           commit('ADD_TO_LIST_ITEMS', response.data.items)
+          commit('UPDATE_READ_ONLY', response.data.readonly)
 
           // Hiding progess bar
           dispatch('overlayStore/showProgressOverlay', false, {root:true})
@@ -231,12 +236,13 @@ const mediasStore = {
         })
       })
     },
-    fetchSingleImage({ dispatch, rootDispatch}, id) {
+    fetchSingleImage({ dispatch, rootDispatch, commit}, id) {
       dispatch('overlayStore/showProgressOverlay', true, {root:true})
       return new Promise((resolve, reject) => {
         axios.get(`/images/${id}`)
         .then((response) => {
-          dispatch('setCurrentImg', response.data)
+          commit('UPDATE_READ_ONLY', response.data.readonly)
+          dispatch('setCurrentImg', response.data.image)
           dispatch('overlayStore/showProgressOverlay', false, {root:true})
           resolve()
         })
@@ -286,6 +292,13 @@ const mediasStore = {
         })
       })
     },
+    checkAddMediaPermission({commit}) {
+      return new Promise(function(resolve, reject) {
+        axios.get(`/images/new`)
+        .then(() => { resolve() })
+        .catch(() => { reject() })
+      })
+    },
     setSearchPage({commit}, page) {
       commit('SET_PAGE', page)
     },

data/app/controllers/rails_admin_image_manager/application_controller.rb

@@ -1,10 +1,15 @@
 module RailsAdminImageManager
-  class ApplicationController < RailsAdmin::ApplicationController
+  class ApplicationController < ActionController::Base
 
     protect_from_forgery with: :exception
 
     before_action :_authenticate!
     before_action :_authorize!
+    before_action :_check_permissions
+
+    def _current_user
+      instance_eval(&RailsAdmin::Config.current_user_method)
+    end
 
    private
 
@@ -16,6 +21,18 @@ module RailsAdminImageManager
       instance_eval(&RailsAdmin::Config.authorize_with)
     end
 
+    def _check_permissions(action=:read)
+      @authorization_adapter.try(:authorize, action, file_model)
+    end
+
+    def file_model
+      RailsAdmin::AbstractModel.new(to_model_name("::RailsAdminImageManager::File"))
+    end
+
+    def to_model_name(param)
+      param.split('~').collect(&:camelize).join('::')
+    end
+
     def filter_by?(param)
       params[param].present?
     end

data/app/controllers/rails_admin_image_manager/images_controller.rb

@@ -8,22 +8,23 @@ module RailsAdminImageManager
         }
 
         format.json {
-          images  = RailsAdminImageManager::File.select(:id, :name, :image_file_name, :created_at).page(params[:page])
+          images  = RailsAdminImageManager::File.select(:id, :name, :image_file_name, :created_at).order(:name).page(params[:page])
           images  = images.filter_by_text(params[:search]) if filter_by?(:search)
           images  = images.filter_by_tags(params[:tags].map{|i| i.to_i }) if filter_by?(:tags)
           images  = images.order_by_date(params[:date]) if filter_by?(:date)
           images  = images.order_by_title(params[:title]) if filter_by?(:title)
 
           images.each do |image|
-              image.src = image.image.url(:index)
+            image.src = image.image.url(:index)
           end
 
-          data    = { items: images, total_count: images.total_count, limit_value: images.limit_value }
+          data    = { items: images, total_count: images.total_count, limit_value: images.limit_value, readonly: readonly? }
 
           render json: data, methods: [:src, :tags_list], status: :ok
         }
       end
     end
+
     def tags
       respond_to do |format|
         format.json {
@@ -33,15 +34,26 @@ module RailsAdminImageManager
       end
     end
 
+    def new
+      _check_permissions(:create)
+      render json: {msg: 'ok'}, status: :ok
+    end
+
     def show
+      _check_permissions(:update)
+
       image                 = RailsAdminImageManager::File.select(:id, :name, :description, :copyright, :image_file_name).find_by!(id: params[:id])
       image.src             = image.image.url(:show)
       image.src_for_wysiwyg = {width: params[:width], height: params[:height]} if filter_by?(:width) && filter_by?(:height)
 
-      render json: image, methods: [:src, :src_for_wysiwyg, :tags_list], status: :ok
+      data                  = { image: image, readonly: readonly? }
+
+      render json: data, methods: [:src, :src_for_wysiwyg, :tags_list], status: :ok
     end
 
     def update
+      _check_permissions(:update)
+
       my_params = images_params
       image = RailsAdminImageManager::File.find(my_params[:id])
 
@@ -61,6 +73,8 @@ module RailsAdminImageManager
     end
 
     def create
+      _check_permissions(:create)
+
       my_params = images_params
 
       # Handling dynamic tag creating when receiving a string
@@ -79,13 +93,21 @@ module RailsAdminImageManager
     end
 
     def destroy
+      _check_permissions(:destroy)
+
       image = RailsAdminImageManager::File.find(params[:id])
       if image.destroy
         render json: image, status: :ok
       else
         render json: image.errors, status: :unprocessable_entity
       end
+    end
+
+   private
 
+    def readonly?
+      return false if @authorization_adapter.nil?
+      !@authorization_adapter.authorized?(:update, file_model)
     end
 
     def images_params

data/config/routes.rb

@@ -3,6 +3,7 @@ RailsAdminImageManager::Engine.routes.draw do
   root    'home#index'
   get     '/tags'       => 'images#tags',  as: 'image_manager_tag_index'
   get     '/images'     => 'images#index',  as: 'image_manager_index'
+  get     '/images/new' => 'images#new'
   get     '/images/:id' => 'images#show'
   put     '/images'     => 'images#update'
   post    '/images'     => 'images#create'

data/lib/paperclip_patch.rb

@@ -6,6 +6,8 @@
 module Paperclip
   class FilenameCleaner
     def call(filename)
+      filename = filename.parameterize
+
       if @invalid_character_regex
         filename = filename.gsub(@invalid_character_regex, "_").gsub("_", "-")
       else

data/lib/rails_admin_image_manager/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminImageManager
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_image_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - iXmedia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails