ish_manager 0.1.8.213 → 0.1.8.214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '048a9695a927421b8e6ab1e3a892d86cbedd0be2439fab600fa78f218c09686a'
-  data.tar.gz: e4644567d755eeacbd52c46093dc9da8934cefec50f255c80cbc8a6e16bf48fb
+  metadata.gz: 97420d8d5159de8bd16e2e2b4c364c72c0f90f1de487c7d4b9346e557a2c603b
+  data.tar.gz: 98cf5b56ed11357f000d31f507f17834cdbbb1f97eeefc768511e71bce8f9042
 SHA512:
-  metadata.gz: 829b40224769dae497fdb879f485a0e1b79c62fe60612e5c18f6042c7a4d49f625ac5844b85d13355970a74f68edfe4bea78724ab592e7dd26a1a236d22186ec
-  data.tar.gz: 1bf55994dac2045f5b7bca5c2b454905ff3d7dfaab58cbc3d5a1222234c3aa7705ef780d48e86c8a869116c104a0655c63e529f7d0d2c0a58d456459d681c35f
+  metadata.gz: b91384e992d08ac1dad9d6a9bef4b7ff43d5a04f4729d679ee27f0a6954a49235008890aed9e05b0a75bfd782a8914d4ec23e53a120cbbcd56a1adb49f20da52
+  data.tar.gz: fbd2cfaf7b4e1a436e62c57924f3f948bb996192e9f922603a63b1f02ab66243acfc6dbe219c304c8476c72c2e4177f7559dc89fec68aa598f35e3952f5559c1

data/app/controllers/ish_manager/videos_controller.rb

@@ -5,7 +5,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   
   def index
     authorize! :index, Video.new
-    @videos = Video.unscoped.where( :user_profile => current_user.profile ).order_by( :created_at => :desc )
+    @videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
 
     if params[:city_id]
       city = City.find params[:city_id]
@@ -51,12 +51,13 @@ class IshManager::VideosController < IshManager::ApplicationController
     @video = Video.new
     authorize! :new, @video
 
-    # @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
-    # @cities_list = City.list
+    @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
+    @cities_list = City.list
   end
   
   def create
-    @video = Video.new params[:video].permit!
+    @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
+      tags city site user_profile premium_tier premium_purchases thumb video |)
     @video.user_profile = current_user.profile
     if !params[:video][:site_id].blank?
       @video.site = Site.find params[:video][:site_id]
@@ -109,7 +110,7 @@ class IshManager::VideosController < IshManager::ApplicationController
     flag = @video.update_attributes( :is_trash => true )
     @video.city.touch if @video.city
     @video.site.touch if @video.site
-    @video.tag.touch if @video.tag
+    @video.tags.map &:touch
     if flag
       flash[:notice] = "deleted video"
     else

data/app/views/ish_manager/user_profiles/_form.haml

@@ -17,19 +17,11 @@
   .input-field
     = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
     %label role name
-    
-  .input-field
-    = f.select :tag, options_for_select( [[nil, nil]] + IshModels::UserProfile::TAGS.map { |r| [ r, r ] }, :selected => profile.tag )
-    %label Tag
 
   .input-field
     = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
     %label City
     
-  .input-field
-    %label About
-    = f.text_area :about, :rows => 10
-    
   .input-field
     = f.label :fb_access_token
     = f.text_field :fb_access_token

data/app/views/ish_manager/videos/_form.haml

@@ -20,11 +20,9 @@
       .field
         = f.label :thumb
         = f.file_field :thumb
-
       .field
-        = f.label :tag_id
-        = select :video, :tag_id, @tags_list, :selected => params[:tag_id]
-
+        = f.label :tags
+        = f.select :tag_ids, @tags_list, {}, { multiple: true }
       .field
         = f.label :city_id
         = select :video, :city_id, @cities_list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.213
+  version: 0.1.8.214
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,7 +129,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - Rakefile
 - app/assets/config/ish_manager_manifest.js
 - app/assets/images/bg/confectionary.png

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2017 piousbox
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.