ish_manager 0.1.8.82 → 0.1.8.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1859e6c3e3ed85ff89bc13fda4b1cd8671b4d44
-  data.tar.gz: 71027c0faf4c9621fe1b4332ebbe78c2fff6d764
+  metadata.gz: ef5a6aa55cfb34623bafc25e0357129814e64f0b
+  data.tar.gz: 2e0a599ef8b5d9793be419f83664f30b85bae30a
 SHA512:
-  metadata.gz: 7063263529b39a4561e6bb12b6599f4c5dddb330566e47b5cf138cb93462055aef4c4935bb6b6697787f6021aa4cf060dd0eb244d3ba8bab3fa6b87d058859ac
-  data.tar.gz: '038bd6ba08740d280bf893a58bf10cef1035f688286e0b7510c3b47d7f5d0793ad6412be0d3b7da4743121b3630a2f95c7ebd36bdc78b273007d420192c0c266'
+  metadata.gz: dde32779443f05995d0ff5b4e6af353567d30ca502c352a0917b482ed2b1fcf2e891960cf74b9045a785a7157c153f913d44db1b0b56a1a5b8190117a104b534
+  data.tar.gz: 0bf4c675b191a2de0006484bee432c01a28668e168a7bfb93b2e115c189a13b1049f8c22d76884e44876261f44143b181ba5f7787b77b78ddc5d2d1622c361d8

data/app/models/ish_manager/ability.rb

@@ -53,6 +53,9 @@ class IshManager::Ability
         can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
           gallery.user_profile == user.profile
         end
+        can [ :show ], ::Gallery do |gallery|
+          gallery.shared_profiles.include? user.profile
+        end
 
         can [ :index ], ::Report
 

data/app/views/ish_manager/application/_meta.haml

@@ -1,18 +1,16 @@
 
 .meta
-  On #{item.created_at.to_s[0...10]}
-  %br
+  <b>On</b> #{item.created_at.to_s[0...10]}
   - if item.city
-    <b>City:</b> #{link_to item.city.name, city_path( item.city )}
-    %br
+    <b>In City:</b> #{link_to item.city.name, city_path( item.city )}
   - if item.tag
     <b>Tag:</b> #{link_to item.tag.name, tag_path( item.tag )}
-    %br
   - if item.site
     <b>Site:</b>
     = link_to "#{item.site.domain}/#{item.site.lang}", site_path( item.site )
-    %br
-  - if item.user
-    <b>User:</b> #{item.user.email}
-    %br
+  - if item.venue
+    <b>Venue:</b>
+    = item.venue.inspect
+  - if item.user_profile
+    <b>By UserProfile:</b> #{item.user_profile.email}
     

data/app/views/ish_manager/friends/index.haml

@@ -17,4 +17,4 @@
       .row
         .col-sm-6.description
           Galleries shared with them:
-          = render 'ish_manager/galleries/index_title', :galleries => friend.shared_galleries
+          = render 'ish_manager/galleries/index_title', :galleries => friend.shared_galleries.where( :user_profile => current_user.profile )

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

@@ -20,9 +20,18 @@
     .col-sm-4
       = f.label :venue
       = select :gallery, :venue_id, @venues_list
-    .col-sm-4
-      = f.label 'Shared with'
-      = f.select :shared_profiles, options_for_select( [[nil,nil,:disabled=>true]]+current_user.profile.friends.map { |f| [ f.email, f.id ] }, :selected => gallery.shared_profiles.map(&:id) ), {}, { :multiple => true }
+  .row
+    .panel
+      .panel-body
+        .col-sm-4
+          = f.label 'Shared with'
+          = f.select :shared_profiles, options_for_select( [[nil,nil,:disabled=>true]]+current_user.profile.friends.map { |f| [ f.email, f.id ] }, :selected => gallery.shared_profiles.map(&:id) ), {}, { :multiple => true }
+        .col-sm-4
+          Shared with:<br />
+          - gallery.shared_profiles.each do |p|
+            &gt; #{p.email} <br />
+        .col-sm-4
+          "/
       
   .row
     .col-sm-3

data/app/views/ish_manager/galleries/_index_title.haml

@@ -5,14 +5,13 @@
 - if galleries.length > 0
   .galleries--list
     - galleries.each do |g|
-      .item
-        %h5
-          = link_to '[~]', edit_gallery_path( g )
-          = link_to g.name, gallery_path(g.galleryname)
+      %h5
+        = link_to '[~]', edit_gallery_path( g )
+        = link_to g.name, gallery_path(g.galleryname)
     .c
 
     - if galleries.respond_to? :total_pages
       = paginate galleries, :param_name => param_name
     
 - else
-  %h5 No Galleries
+  %p No Galleries

data/app/views/ish_manager/galleries/_list.haml

@@ -5,17 +5,19 @@
 - if galleries.length > 0
   .galleries--list
     - galleries.each do |g|
-      .item
-        %h3
-          = link_to '[~]', edit_gallery_path( g )
-          = link_to g.name, gallery_path(g.galleryname)
-        -# = render 'meta', :item => g
-        - if g.photos.length == 0
-          = image_missing
-        - else
-          - g.photos.limit( n_thumbs ).each do |photo|
-            = link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
-    .c
+      .panel
+        .panel-body
+          %h3
+            = link_to '[~]', edit_gallery_path( g )
+            = link_to g.name, gallery_path(g.galleryname)
+          = render 'meta', :item => g
+
+          -# = render 'meta', :item => g
+          - if g.photos.length == 0
+            = image_missing
+          - else
+            - g.photos.limit( n_thumbs ).each do |photo|
+              = link_to image_tag(photo.photo.url(:thumb), :alt => g.name, :class => :thumb ), gallery_path(g.galleryname)
 
     - if galleries.respond_to? :total_pages
       = paginate galleries, :param_name => param_name

data/app/views/ish_manager/galleries/_title.haml

@@ -7,4 +7,4 @@
         = link_to '[~]', edit_gallery_path( gallery )
         [x]
       galleryname :: #{gallery.galleryname}
-      = render 'meta', :gallery => gallery
+      = render 'meta', :item => gallery

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

@@ -1,16 +1,24 @@
 
-%h1
+%h5
   User Profiles (#{@user_profiles.count})
   = link_to '[+]', new_user_profile_path
  
-%ul
-  - @user_profiles.each do |profile|
-    .panel
-      %ul
-        %li= link_to '[edit]', edit_user_profile_path( profile )
-        %li <b>Email:</b> #{profile.email}
-        %li <b>Name:</b> #{profile.name}
-        %li <b>Role:</b> #{profile.role_name}
-        %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
-        %li <b>About:</b> #{profile.about}
-      %br
+
+- @user_profiles.each do |profile|
+  .panel
+    .panel-body
+      .row
+        .col-sm-4
+          %ul
+            %li= link_to '[edit]', edit_user_profile_path( profile )
+            %li <b>Email:</b> #{profile.email}
+            %li <b>Name:</b> #{profile.name}
+            %li <b>Role:</b> #{profile.role_name}
+            %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
+            %li <b>About:</b> #{profile.about}
+        .col-sm-8
+          Shared galleries:<br />
+          - profile.shared_galleries.each do |g|
+            &gt; #{link_to g.name, gallery_path(g.galleryname)} <br />
+            = render 'meta', :item => g
+          

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.82
+  version: 0.1.8.83
 platform: ruby
 authors:
 - piousbox
@@ -223,7 +223,6 @@ files:
 - app/views/ish_manager/galleries/_list_short.haml
 - app/views/ish_manager/galleries/_menu_secondary.haml
 - app/views/ish_manager/galleries/_menu_secondary.haml~
-- app/views/ish_manager/galleries/_meta.haml
 - app/views/ish_manager/galleries/_meta.haml~
 - app/views/ish_manager/galleries/_search.haml
 - app/views/ish_manager/galleries/_search.haml~

data/app/views/ish_manager/galleries/_meta.haml

@@ -1,13 +0,0 @@
-
-.galleries--meta
-  .row
-    .large-12.columns
-      - if gallery.site
-        Site #{link_to "http://#{gallery.site.domain}/#{gallery.site.lang}", site_path(gallery.site)}
-        User :: #{gallery.username ? gallery.username.inspect : '<no-user>' }
-      - if gallery.city
-        City #{link_to gallery.city.name, city_path(gallery.city)}
-      - if gallery.venue
-        Venue #{link_to gallery.venue.name, venue_path(gallery.venue)}
-      - if gallery.is_trash
-        = trash_image_tag