ish_manager 0.1.8.210 → 0.1.8.211

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/ish_manager/application_controller.rb +1 -1
  3. data/app/controllers/ish_manager/reports_controller.rb +1 -1
  4. data/app/controllers/ish_manager/venues_controller.rb +4 -3
  5. data/app/views/ish_manager/cities/show.haml +6 -0
  6. data/app/views/ish_manager/venues/_form.haml +1 -1
  7. data/app/views/ish_manager/venues/_index.haml +3 -4
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 37a33ce44605214709bb78ad4465bb78ead02cb9267efdd5881a427a1d8a2500
4
- data.tar.gz: 98c7d3d4e5bc3219a72b4e77acded98686e7b02da8d4906f9fc54d2041909c36
3
+ metadata.gz: b5b8a4e31fb098933db380ae70c47bfbc5adbda36915af52c9df02073bdc754e
4
+ data.tar.gz: '09cd911eac213b44bdc3490129312f7f591a56061601e79a6441748f6c19480a'
5
5
  SHA512:
6
- metadata.gz: c2d52f10a3568f3d03bfb9e403e2bbebd059c356f4fca23ae3f802e7e0adafe87b284f7e53a6058a25a5f62b7bf3d28b06a9e33cb1a055f81aa9a966f7b1497f
7
- data.tar.gz: dd6dd7c11848237139d686947783c8147bb7da3d071791c25d9a6631d4d2d59d9469a6a5597edb45070a732ada802838e45a715318b28631c5c4bc754bf9c1e0
6
+ metadata.gz: c72103d88cd07d48509728ebf8fa5edef4ab320dc1752c03edb71beb00339f333b114ebc629dab39bd2c2e9fcfe67cc9752203f8608b30a19edf5c0f4006ca30
7
+ data.tar.gz: 4500d8ea36d6f7d40e2e9c299a9a7515c1f1a342733dd8494fdb43b709136130eaf4592e32323800042ed6737c86c8d27c2e4a4880131756ab077a6d3e2ed653
data/app/controllers/ish_manager/application_controller.rb CHANGED
@@ -26,7 +26,7 @@ module IshManager
26
26
 
27
27
  def set_lists
28
28
  @sites_list = Site.all.list
29
- @cities_list = City.all.list
29
+ @cities_list = City.list
30
30
  @venues_list = Venue.all.list
31
31
  @reports_list = Report.all.list
32
32
  @galleries_list = Gallery.all.list
data/app/controllers/ish_manager/reports_controller.rb CHANGED
@@ -63,7 +63,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
63
63
  authorize! :new, @report
64
64
  @tags_list = Tag.all.where( :is_public => true ).list
65
65
  @sites_list = Site.all.list
66
- @cities_list = City.all.list
66
+ @cities_list = City.list
67
67
  @venues_list = Venue.all.list
68
68
 
69
69
  respond_to do |format|
data/app/controllers/ish_manager/venues_controller.rb CHANGED
@@ -14,6 +14,7 @@ class IshManager::VenuesController < IshManager::ApplicationController
14
14
 
15
15
  def new
16
16
  @venue = Venue.new
17
+ @venue.city_id = params[:city_id] if params[:city_id]
17
18
  authorize! :new, @venue
18
19
  end
19
20
 
@@ -21,7 +22,7 @@ class IshManager::VenuesController < IshManager::ApplicationController
21
22
  @venue = Venue.new params[:venue].permit!
22
23
  authorize! :create, @venue
23
24
  if @venue.save
24
- redirect_to :action => :index
25
+ redirect_to city_path( params[:venue][:city_id] ), :notice => 'Venue successfully created.'
25
26
  else
26
27
  flash[:alert] = @venue.errors.messages
27
28
  render :action => :new
@@ -41,7 +42,7 @@ class IshManager::VenuesController < IshManager::ApplicationController
41
42
  flag = @venue.update_attributes params[:venue].permit!
42
43
  if flag
43
44
  flash[:notice] = 'updated venue'
44
- redirect_to :action => :index
45
+ redirect_to city_path( params[:venue][:city_id] )
45
46
  else
46
47
  flash[:alert] = "No luck: #{@venue.errors.messages}"
47
48
  render :action => :edit
@@ -63,7 +64,7 @@ class IshManager::VenuesController < IshManager::ApplicationController
63
64
  else
64
65
  flash[:alert] = "Cannot delete venue: #{@venue.errors.messages}"
65
66
  end
66
- redirect_to venues_path
67
+ redirect_to city_path( @venue.city_id )
67
68
  end
68
69
 
69
70
  end
data/app/views/ish_manager/cities/show.haml CHANGED
@@ -12,6 +12,12 @@
12
12
  .col-sm-6
13
13
  %h5 Galleries
14
14
  = render 'ish_manager/galleries/index', :galleries => @city.galleries
15
+ .row
16
+ .col-sm-6
17
+ %h5
18
+ Venues (#{@city.venues.length})
19
+ = link_to image_new, new_venue_path(city_id: @city.id)
20
+ = render 'ish_manager/venues/index', :venues => @city.venues
15
21
  .row
16
22
  .col-sm-6= render 'ish_manager/videos/index', :videos => @city.videos
17
23
  .col-sm-6
data/app/views/ish_manager/venues/_form.haml CHANGED
@@ -23,7 +23,7 @@
23
23
  .row
24
24
  .col-sm-6
25
25
  = f.label :city
26
- = f.select :city, options_for_select( @cities_list, :selected => venue.city_id )
26
+ = f.select :city_id, options_for_select( @cities_list, :selected => venue.city_id )
27
27
  .col-sm-6
28
28
  coords
29
29
  .row
data/app/views/ish_manager/venues/_index.haml CHANGED
@@ -1,10 +1,9 @@
1
-
2
1
  %ol
3
2
  - venues.each do |venue|
4
3
  %li
5
- = link_to image_edit, edit_venue_path( venue )
6
- .float-left= button_to '[x]', venue_path( venue ), :method => 'delete', :data => { :confirm => 'Are you sure?' }
7
- = link_to venue.name, venue_path( venue )
4
+ = link_to image_edit, edit_venue_path(venue)
5
+ .float-left= button_to '[x]', venue_path(venue), :method => 'delete', :data => { :confirm => 'Are you sure?' }
6
+ = link_to venue.name, venue_path(venue)
8
7
  %br
9
8
  %br
10
9
  .clearfix
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.210
4
+ version: 0.1.8.211
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-21 00:00:00.000000000 Z
11
+ date: 2020-03-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails