voluntary 0.1.0 → 0.2.0

data/app/views/projects/_form.html.erb

@@ -2,6 +2,7 @@
   <%= render partial: 'shared/form/error_messages', locals: { resource: @project } %>
   
   <div class="form-inputs">
+  	<%= f.input :organization_id, collection: current_user.organizations %>
     <%= f.input :product_id, collection: Product.all %>
     <%= f.input :name %>  
     <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>

data/app/views/projects/show.html.erb

@@ -4,7 +4,8 @@
 </h3>
 
 <dl class="dl-horizontal">
-  <%= show_associations :product, :user, :areas %>
+	<%= show_attribute(:product, title: t("attributes.product"), value: link_to(resource.product.name, product_path(resource.product))) if resource.product.present? %>
+  <%= show_associations :user, :organization, :areas %>
   <%= show_actions %>
 </dl>
 

data/app/views/shared/collection/_list.html.erb

@@ -10,7 +10,7 @@
       <th>
     <% (columns.is_a?(Hash) ? columns.keys : columns).each do |column| %>
         <strong><%= t(
-          "activerecord.attributes.general.#{column}", 
+          "attributes.#{column}", 
           default: t("activerecord.attributes.#{type.singularize}.#{column}")
         ) %>:</strong> 
         

data/app/views/shared/resource/_actions.html.erb

@@ -9,8 +9,8 @@
   <% if can? :destroy, resource %>    
     <li>
       <%= link_to(
-        t('general.destroy'), resource, id: "#{resource.class.name.tableize.singularize}_#{resource.id}", method: :delete, 
-        confirm: t('general.questions.are_you_sure'),
+        t('general.destroy'), polymorphic_or_resource_path(resource), id: "#{resource.class.name.tableize.singularize}_#{resource.id}", method: :delete, 
+        data: { confirm: t('general.questions.are_you_sure') },
         onclick: "delete_link('#{resource.class.name.tableize.singularize}_#{resource.id}'); return false;"
       ) 
       %>

data/app/views/stories/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@story, html: {class: 'form-vertical'}) do |f| %>
+<%= simple_form_for(@story, url: @story.new_record? ? stories_path : story_path(@story), as: :story, html: {class: 'form-vertical'}) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @story } %>
   
   <% unless @story.new_record? %>

data/app/views/stories/steps/_activate.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@story, html: {class: 'floating_form form-vertical'}) do |f| %>
+<%= simple_form_for(@story, url: story_path(@story), as: :story, html: {class: 'floating_form form-vertical'}) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @story } %>
   <% if step == :activate %>
   <input type="hidden" name="next_step" value="1"/>

data/app/views/workflow/products/show.html.erb

@@ -5,6 +5,6 @@
   	'name' => ->(resource) do
   	  link_to resource.name, product_area_workflow_user_index_path(params[:id], resource)	
     end, 'users_count' => nil 
-  }
+  }, options: { append_new_link: false }
 %>
 

data/app/views/workflow/project_owner/_candidatures.html.erb

@@ -18,7 +18,8 @@
             <%= render partial: 'shared/collection/table', locals: { 
               type: 'candidatures', collection: @candidatures[state], 
               columns: { 
-                'project_id' => 'vacancy.project', 'vacancy_id' => '', 'name' => 'user.name', 'user_id' => ''
+                'project_id' => 'vacancy.project', 'vacancy_id' => '', 'name' => 'user.name', 
+                'resource_id' => ''
               },
               options: {show_title: false, append_new_link: false }
             } %>

data/app/views/workflow/tasks/_work_head.html.erb

@@ -1,6 +1,6 @@
 <h3><%= resource.name %></h3>
 
-<strong><%= t('activerecord.attributes.general.state') %>:</strong> <%= resource.state %>
+<strong><%= t('attributes.state') %>:</strong> <%= resource.state %>
 
 <h4><%= t('tasks.show.story_text') %></h4>
 

data/app/views/workflow/tasks/steps/_complete.html.erb

@@ -1,7 +1,11 @@
-<%= render 'workflow/tasks/work_head', resource: resource %>
+<%= render_product_specific_partial_if_available(
+  resource, 'workflow/tasks/work_head' 
+) %>
 
 <%= simple_form_for(resource, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
-  <%= render 'workflow/tasks/work_form', f: f, resource: resource %>
+  <%= render_product_specific_partial_if_available(
+    resource, 'workflow/tasks/work_form', f: f, resource: resource 
+  ) %>
   
   <div class="form-actions">
     <%= f.button :submit %>

data/app/views/workflow/tasks/steps/_review.html.erb

@@ -1,7 +1,11 @@
-<%= render 'workflow/tasks/work_head', resource: resource %>
+<%= render_product_specific_partial_if_available(
+  resource, 'workflow/tasks/work_head' 
+) %>
 
 <%= simple_form_for(resource, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
-  <%= render 'workflow/tasks/work_form', f: f, resource: resource %>
+  <%= render_product_specific_partial_if_available( 
+    resource, 'workflow/tasks/work_form', f: f, resource: resource
+  ) %>
   
   <div class="form-actions">
     <%= f.button :submit %>

data/app/views/workflow/tasks/steps/_work.html.erb

@@ -2,8 +2,10 @@
   resource, 'workflow/tasks/work_head'
 ) %>
 
-<%= simple_form_for(resource, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
-  <%= render 'workflow/tasks/work_form', f: f, resource: resource %>
+<%= simple_form_for(resource, as: :task, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
+  <%= render_product_specific_partial_if_available(
+    resource, 'workflow/tasks/work_form', f: f, resource: resource
+  ) %>
   
   <div class="form-actions">
     <%= f.button :submit %>

data/config/initializers/devise.rb

@@ -71,7 +71,7 @@ Devise.setup do |config|
   # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
   # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
+  #config.encryptor = :bcrypt
 
   # Setup a pepper to generate the encrypted password.
   config.pepper = "065eb8798b181ff0ea2c5c16aee0ff8b70e04e2ee6bd6e08b49da46924223e39127d5335e466207d42bf2a045c12be5f90e92012a4f05f7fc6d9f3c875f4c95b"
@@ -136,10 +136,6 @@ Devise.setup do |config|
   # change their passwords.
   config.reset_password_within = 6.hours
 
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  config.token_authentication_key = :auth_token
-  
   # TODO: works at least for diaspora repository
   #config.stateless_token = true
 
@@ -189,5 +185,6 @@ Devise.setup do |config|
   #   end
   #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
   # end
+  config.secret_key = '3c4cb1dfba4a47b762c39100e0aeaf377be5dc503304a13e94825eb07d922c493d268daabffed67826c1041269ee3168d2156862ab2d9691445d79ab051fc8be'
 end
 

data/config/initializers/filter_parameters_logging.rb

@@ -0,0 +1 @@
+Rails.application.config.filter_parameters += [:password]

data/config/initializers/friendly_id.rb

@@ -0,0 +1,88 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  # config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but you if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end

data/config/initializers/wrap_parameters.rb

@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  include ActionController::ParamsWrapper
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/config/locales/general/en.yml

@@ -3,6 +3,8 @@ en:
     index:
       title: Home
     new: New
+    denied: Denied
+    accepted: Accepted
     edit: Edit
     destroy: Destroy
     remove: Remove
@@ -12,7 +14,7 @@ en:
     list_action: Back to the overview
     details: Details
     form:
-      errors_count: '%{count} prohibited this product from being saved:'
+      errors_count: '%{count} prohibited this object from being saved:'
       successfully_created: Creation successful
       successfully_updated: Update successful
       destroyed: Resource destroyed successfully.
@@ -27,13 +29,24 @@ en:
       not_found: Resource not found.
     notifications:
       event_successful: "%{event} successful."  
-      
+   
+  attributes:  
+    name: Name 
+    text: Text
+    parent: Parent
+    project_id: Project
+    state: State
+    user_id: User
+    vacancy_id: Vacancy  
+    roles: Roles
+    
   activerecord:
     models:
       area: Area
       candidature: Candidature
       comment: Comment
       product: Product
+      organization: Organization
       project: Project
       result: Result
       story: Story
@@ -42,13 +55,6 @@ en:
       vacancy: Vacancy
       
     attributes:
-      general:
-        name: Name 
-        parent: Parent
-        project_id: Project
-        state: State
-        user_id: User
-        vacancy_id: Vacancy
       comment:
         name: Subject
       vacancy:

data/config/locales/resources/story/en.yml

@@ -11,6 +11,7 @@ en:
     show:
       states:
         completed: Completed
+        active: Active
         
     edit: 
       title: Edit Story 

data/config/routes.rb

@@ -37,6 +37,15 @@ Rails.application.routes.draw do
     end
   end
   
+  resources :organizations do
+    resources :projects
+    
+    collection do
+      put :update_multiple
+      get :autocomplete
+    end
+  end
+  
   resources :projects do
     resources :users, only: :index
     resources :vacancies, only: [:index, :new]

data/config/routes/workflow.rb

@@ -1,34 +1,34 @@
-match 'workflow' => 'workflow#index', as: :workflow
+get 'workflow' => 'workflow#index', as: :workflow
 
 namespace 'workflow' do
   resources :project_owner, only: :index do
     collection do
-      match 'tasks/:id/edit' => 'tasks#edit', as: :edit_task
+      get 'tasks/:id/edit' => 'tasks#edit', as: :edit_task
     end
   end
   
   resources :user, only: :index do
     collection do    
-      match 'products/:id' => 'products#show', as: :product
-      match 'products/:product_id/areas/:id' => 'user/product/areas#show', as: :product_area
+      get 'products/:id' => 'products#show', as: :product
+      get 'products/:product_id/areas/:id' => 'user/product/areas#show', as: :product_area
       
-      match 'projects/:id' => 'user/projects#show', as: :user_project
+      get 'projects/:id' => 'user/projects#show', as: :user_project
       
-      match 'stories/:story_id/tasks' => 'tasks#index', as: :tasks
-      match 'stories/:story_id/tasks/next' => 'tasks#next', as: :next_task
-      put 'tasks/:id' => 'tasks#update', as: :update_task
-      match 'tasks/:id/edit' => 'tasks#edit', as: :edit_task
+      get 'stories/:story_id/tasks' => 'tasks#index', as: :tasks
+      get 'stories/:story_id/tasks/next' => 'tasks#next', as: :next_task
+      patch 'tasks/:id' => 'tasks#update', as: :update_task
+      get 'tasks/:id/edit' => 'tasks#edit', as: :edit_task
           
-      match 'tasks/:id/assign' => 'tasks#assign', as: :assign_task
-      match 'tasks/:id/review' => 'tasks#review', as: :review_task
-      match 'tasks/:id/unassign' => 'tasks#unassign', as: :unassign_task
-      match 'tasks/:id/complete' => 'tasks#complete', as: :complete_task
+      get 'tasks/:id/assign' => 'tasks#assign', as: :assign_task
+      get 'tasks/:id/review' => 'tasks#review', as: :review_task
+      get 'tasks/:id/unassign' => 'tasks#unassign', as: :unassign_task
+      get 'tasks/:id/complete' => 'tasks#complete', as: :complete_task
     end
   end
   
   resources :vacancies, controller: 'vacancies', only: :index do
     collection do
-      match '/' => 'vacancies#open', as: :open
+      get '/' => 'vacancies#open', as: :open
       
       get :autocomplete
       
@@ -41,7 +41,7 @@ namespace 'workflow' do
   
   resources :candidatures, controller: 'candidatures', only: :index do
     collection do
-      match '/' => 'candidatures#new', as: :new
+      get '/' => 'candidatures#new', as: :new
        
       get :autocomplete 
        

data/db/migrate/20120907144853_create_schema.rb

@@ -220,4 +220,4 @@ class CreateSchema < ActiveRecord::Migration
   def down
     raise 'irreversable migration!'
   end
-end
+end

data/db/migrate/20120922201955_create_mongo_db_documents.rb

@@ -1,7 +1,7 @@
 class CreateMongoDbDocuments < ActiveRecord::Migration
   def change
     create_table :mongo_db_documents do |t|
-      t.integer :mongo_db_object_id
+      t.string :mongo_db_object_id
       t.string :klass_name
       t.string :name
       t.string :slug

data/db/migrate/20121004132105_create_professions.rb

@@ -6,7 +6,7 @@ class CreateProfessions < ActiveRecord::Migration
       t.timestamps
     end
     
-    remove_column :users, :profession
+    remove_column :users, :profession, :string
     add_column :users, :profession_id, :integer
     add_index :users, :profession_id
   end

data/db/migrate/20121006162913_add_public_attribute_to_roles.rb

@@ -1,6 +1,25 @@
 class AddPublicAttributeToRoles < ActiveRecord::Migration
-  def change
+  def up
     add_column :roles, :public, :boolean, default: false
+    
+    roles = []
+    
+    Role.all.each do |role|
+      roles << [role.id, ['Project_owner', 'User'].include?(role.name)]
+    end
+    
+    roles.each do |role|
+      Role.find(role.first).update_attribute(:public, role.second)
+    end
+    
     add_column :users, :main_role_id, :integer
+    
+    user_role_id = Role.find_or_create_by(name: 'User').id
+    User.update_all main_role_id: user_role_id
+  end
+  
+  def down
+    remove_column :roles, :public, :boolean
+    remove_column :users, :main_role_id, :integer
   end
 end