ish_manager 0.1.8.23 → 0.1.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7321ef6d866b6c6ef55008414a64bd2838c57aa
-  data.tar.gz: e01b404689d320b94b2dc60d032923b8e96be936
+  metadata.gz: a38a20e38b5e29c8e5f4258bd58942a922a0b369
+  data.tar.gz: bab59f30485aee9d86b95ef9c02627e1be30f985
 SHA512:
-  metadata.gz: b5cf4cb139bc4bd91696ca450ace3ce18dece7262477628227e8d64a954abcef65c874e18fe5afc937306a9a69a97a2b80ef46a1018ee26b047e4a781250e9dd
-  data.tar.gz: c37b1b4e10aa55eb68feec642265c481b6f92709d332514fc46e0ba0e591c7f8bcbe16356c93658dac69a7ded0b5634ed379a6b8bd12dfed5ca05b29718501d4
+  metadata.gz: 008e4acf1a5b152bf3c947f08877224205ece3b4c356ddda3763094ce6ecb6fcb7480345e045f2dda5dc582d54a9e7d5c22814c574530d78636f527cf5f42264
+  data.tar.gz: 604ca5f41e82ef3327774aa48aeaa613cbf279c7377b2f618d66ada64bdf544cf25ced91ae815b67c328f62af91b9df9051e48f8a0b6d2341fb19e8a786502ae

data/app/controllers/ish_manager/cities_controller.rb

@@ -14,17 +14,19 @@ class IshManager::CitiesController < IshManager::ApplicationController
   end
   
   def new
-    authorize! :new, ManagerCity.new
     @city = City.new
+    authorize! :new, City
+
     @photo = Photo.new
   end
 
   def create
-    authorize! :create, ManagerCity.new
     @city = City.new params[:city].permit!
+    authorize! :create, @city
+
     if @city.save
       flash[:notice] = 'Success'
-      redirect_to manager_cities_path
+      redirect_to cities_path
     else
       flash[:error] = 'No Luck'
       render :action => :new
@@ -36,12 +38,12 @@ class IshManager::CitiesController < IshManager::ApplicationController
   end
   
   def update
-    authorize! :update, ManagerCity.new
     @city = City.find( params[:id] )
+    authorize! :update, @city
     @city.update_attributes params[:city].permit!
     if @city.save
       flash[:notice] = 'Success'
-      redirect_to edit_manager_city_path @city.id
+      redirect_to edit_city_path @city.id
     else
       flash[:error] = 'No Luck. ' + @city.errors.inspect
       @newsitems = @city.newsitems.all.page( params[:newsitems_page] )
@@ -52,7 +54,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
   end
 
   def change_profile_pic
-    authorize! :change_profile_pic, ManagerCity.new
+    authorize! :change_profile_pic, City
     @city = City.find params[:id]
     @photo = Photo.new params[:photo]
     @photo.user = @current_user
@@ -64,7 +66,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
     else
       flash[:error] = "No Luck. #{@photo.errors.inspect} #{@city.errors.inspect}"
     end
-    redirect_to manager_cities_path
+    redirect_to cities_path
   end
 
   private

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

@@ -30,6 +30,10 @@
         .field
           = f.label :n_features
           = f.number_field :n_features
+
+        .field
+          = f.label :description
+          = f.text_area :description, :class => [ :tinymce ]
           
         .field
           %label Calendar

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

@@ -10,7 +10,7 @@
     
   .a
     = f.label :descr
-    = f.text_area :descr
+    = f.text_area :descr, :class => [ :tinymce ]
 
   .a
     coords

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.23
+  version: 0.1.8.24
 platform: ruby
 authors:
 - piousbox