voluntary 0.6.0 → 0.7.0

data/app/controllers/stories_controller.rb

@@ -27,7 +27,7 @@ class StoriesController < ApplicationController
   
   def create
     if @story.initialization
-      redirect_to edit_story_path(@story) and return
+      redirect_to @story.after_creation_path and return
     else
       render_wizard
     end

data/app/controllers/tasks_controller.rb

@@ -1,68 +1,65 @@
 class TasksController < ApplicationController
   include Applicat::Mvc::Controller::Resource
-  include Wizard::Controller
-  
-  wizard_steps :setup_tasks, :activate
   
   before_filter :build_resource, only: [:new, :create]
-  before_filter :resource, only: [:show, :edit, :update, :setup_tasks, :activate]
+  before_filter :resource, only: [:show, :edit, :update, :destroy]
   
   load_and_authorize_resource
   
   respond_to :html, :js, :json
   
   def index
-    parent = find_parent Task::PARENT_TYPES
-    @tasks = parent ? parent.tasks : Task.all
+    @story = Story.find(params[:story_id])
+    @project = @story.project
+    @tasks = @story.custom_tasks
+    @tasks = @tasks.paginate(page: params[:page], per_page: 25)
+    @twitter_sidenav_level = 5
   end
   
   def show
     @comments = @task.comments
+    @hide_sidebar = true
+    
+    begin
+      raise NotImplementedError if @project.product_id.blank?
+      
+      render "products/types/#{@project.product.class.name.split('Product::').last.tableize.singularize}/tasks/show"
+    rescue NotImplementedError, ActionView::MissingTemplate
+      render 'show'
+    end
   end
   
   def new
-    render_wizard
   end
   
   def create
-    if @task.initialization
-      redirect_to edit_task_path(@task) and return
+    if @task.save
+      redirect_to story_tasks_path(@story), notice: t('tasks.create.successful')
     else
-      render_wizard
+      render 'new'
     end
   end
   
   def edit
-    render_wizard
   end
   
   def update
-    @task.attributes = params[:task]
-    
-    # shift the first empty task set after initialization on state :initialized
-    @task.tasks.shift if params[:next_step] == '1' && !@task.tasks.first.valid?
-    success = params[:next_step] == '1' ? @task.send(step) : @task.save
-      
-    if success
+    if @task.update(params[:task])
       redirect_to(
-        edit_task_path(@task), notice: t('general.form.successfully_updated')
+        edit_task_path(@task), notice: t('tasks.update.successful')
       )
-    else
-      render_wizard
     end
-    
-    return
   end
 
   def destroy
-    @task = Task.find(params[:id])
     @task.destroy
-    redirect_to @task.story, notice: t('general.form.destroyed')
+    redirect_to story_tasks_path(@story), notice: t('general.form.destroyed')
   end
   
   def resource
     @task = Task.find(params[:id]) unless @task || !params[:id].present?
     @story = @task.story unless @story || !@task
+    @project = @story.project
     @task
   end
   
@@ -76,13 +73,7 @@ class TasksController < ApplicationController
   
   def build_resource
     @story = find_parent Task::PARENT_TYPES, action_name == 'create' ? :task : nil
+    @project = @story.project
     @task = @story.tasks.new({ story_id: @story.id }.merge(params[:task] || {}))
   end
-  
-  def render_wizard
-    @presenter = Resources::General::Wizards::TaskPresenter.new(
-      self.view_context, resource: resource
-    )
-    render 'general/wizard'
-  end
 end

data/app/controllers/users_controller.rb

@@ -18,24 +18,31 @@ class UsersController < ApplicationController
   end
   
   def edit
+    @user.attributes = params[:user] if params[:user].present?
   end
   
   def preferences
-    if params[:user] && current_user.update_attributes(params[:user])
-      redirect_to preferences_user_path(current_user), notice: t('general.form.successfully_updated') and return
+    raise CanCan::AccessDenied if !current_user || (current_user.id != @user.id && !current_user.roles?(:master))
+    
+    if params[:user] && @user.update_attributes(params[:user])
+      redirect_to preferences_user_path(@user), notice: t('general.form.successfully_updated') and return
     end
   end
   
   def update
-    if current_user.update_attributes(params[:user])
-      redirect_to edit_user_path(current_user), notice: t('general.form.successfully_updated')
+    raise CanCan::AccessDenied if !current_user || (current_user.id != @user.id && !current_user.roles?(:master))
+    
+    if @user.update_attributes(params[:user])
+      redirect_to edit_user_path(@user), notice: t('general.form.successfully_updated')
     else
       render :edit
     end
   end
 
   def destroy
-    current_user.destroy
+    raise CanCan::AccessDenied if !current_user || (current_user.id != @user.id && !current_user.roles?(:master))
+    
+    @user.destroy
     redirect_to users_url, notice: t('general.form.destroyed')
   end
   

data/app/controllers/workflow/products_controller.rb

@@ -1,4 +1,6 @@
 class Workflow::ProductsController < ApplicationController
+  before_action :authenticate_user!
+  
   def show
     @stories = Product.stories(params[:id], current_user)
     @areas = Area.find_by_product_id(params[:id])

data/app/models/story.rb

@@ -77,6 +77,14 @@ class Story
     task
   end
   
+  def after_creation_path
+    Rails.application.routes.url_helpers.edit_story_path self
+  end
+  
+  def custom_tasks
+    tasks
+  end
+  
   protected
   
   def with_offeror

data/app/models/user.rb

@@ -28,7 +28,7 @@ class User < ActiveRecord::Base
   attr_accessible :name, :password, :password_confirmation, :remember_me, :text, :language, :first_name, :last_name, 
                   :salutation, :marital_status, :family_status, :date_of_birth, :place_of_birth, :citizenship, 
                   :email, :country, :language, :interface_language, :foreign_language_tokens, :profession_id, 
-                  :employment_relationship, :area_tokens, :remember_me
+                  :employment_relationship, :area_tokens, :remember_me, :timezone
        
   # :timeoutable, :token_authenticatable, :lockable,
   # :lock_strategy => :none, :unlock_strategy => :nones

data/app/presenters/resources/user/form_presenter.rb

@@ -7,7 +7,7 @@ class Resources::User::FormPresenter < ResourcePresenter
     list += [:password, :password_confirmation] if resource.new_record? && resource.provider.blank?
     
     list += [
-      :country, :language, :interface_language, :foreign_language_tokens, :profession, 
+      :country, :language, :interface_language, :foreign_language_tokens, :timezone, :profession, 
       :employment_relationship, :area_tokens
     ]
     

data/app/views/layouts/application.html.erb

@@ -6,10 +6,11 @@
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <%= stylesheet_link_tag *voluntary_application_stylesheets, media: 'all' %>
+  <%= yield :stylesheet_includes %>
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
-  <div id="bootstrap_modal" class="modal fade"></div>
+  <div id="bootstrap_modal" class="modal fade" style="overflow-y:auto;"></div>
   
   <section id="dialog">
     <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>

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

@@ -0,0 +1,5 @@
+<%= simple_form_for(@task, url: @task.new_record? ? tasks_path : task_path(@task), as: :task, html: {class: 'form-vertical', style: 'margin-bottom:15px;'}) do |f| %>
+  <%= f.input :name %>  
+  <%= f.input :text, as: :text %>
+  <%= f.button :submit %>
+<% end %>

data/app/views/tasks/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('tasks.edit.title') %></h1>
+
+<%= render_product_specific_partial_if_available @story, 'tasks/form' %>

data/app/views/tasks/index.html.erb

@@ -0,0 +1,5 @@
+<h1><%= t('tasks.index.title') %></h1>
+
+<%= render_product_specific_partial_if_available(@story, 'tasks/collection', collection: @tasks) %>
+
+<%= will_paginate @tasks %>

data/app/views/tasks/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('tasks.new.title') %></h1>
+
+<%= render_product_specific_partial_if_available @story, 'tasks/form' %>

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

@@ -7,14 +7,14 @@
 
 <h4><%= t('tasks.show.story_text') %></h4>
 
-<%= resource.story.text %>
+<%= markdown resource.story.text %>
 
 <% if resource.text.present? %>
-<h4><%= t('tasks.show.text') %></h4>
-
-<%= resource.text %>
+  <h4><%= t('tasks.show.text') %></h4>
+  
+  <%= markdown resource.text %>
 <% end %>
 
 <h4><%= t('activerecord.models.result') %></h4>
 
-<%= resource.result.text if resource.result_id.present? %>
+<%= markdown resource.result.text if resource.result_id.present? %>

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

@@ -17,6 +17,8 @@
       f.input attribute, collection: available_language_options
     when :foreign_language_tokens
       f.input attribute, as: :string, input_html: { data: { load: resource.foreign_language_tokens } } unless Rails.env == 'test'
+    when :timezone
+      f.input attribute, as: :time_zone
     when :profession
       autocomplete_input(f, attribute)
     when :employment_relationship

data/config/locales/general/en.yml

@@ -4,12 +4,16 @@ en:
     anonymous: Anonymous
     authentication: Authentication
     author: Author
+    calendar: Calendar
     cancel: Cancel
     contra: contra
     issues: Issues
+    list: List
     neutral: neutral
     pro: pro
     sign_out: Sign out
+    sign_up: Sign up
+    unlimited: unlimited
     vote: Vote
     
     index:
@@ -62,9 +66,11 @@ en:
       license: Code licensed under %{link}
       
   attributes: 
-    id: ID 
+    id: ID
+    from: From
     name: Name 
     text: Text
+    to: To
     parent: Parent
     project_id: Project
     state: State
@@ -73,6 +79,11 @@ en:
     position: Position
     date: Date
     trend: Trend
+    address: Address
+    description: Description
+    string: String
+    timezone: Timezone
+    resource_type: Resource type
     
   activerecord:
     models:

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

@@ -17,6 +17,9 @@ en:
     new: 
       title: New Task
     
+    create:
+      successful: Task successfully created.
+      
     show:
       story_text: Story
       text: Task Text
@@ -25,6 +28,9 @@ en:
     
     edit: 
       title: Edit Task  
+    
+    update:
+      successful: Task successfully updated.
       
   activerecord:
     errors:

data/db/migrate/20150808155719_add_api_key_to_users.rb

@@ -1,5 +1,5 @@
 class AddApiKeyToUsers < ActiveRecord::Migration
-  def change
+  def up
     add_column :users, :api_key, :string, limit: 32
     
     User.where('api_key IS NULL').find_each do |user|
@@ -10,4 +10,8 @@ class AddApiKeyToUsers < ActiveRecord::Migration
       user.save!
     end
   end
+  
+  def down
+    remove_column :users, :api_key
+  end
 end

data/db/migrate/20151022163015_add_timezone_to_users.rb

@@ -0,0 +1,5 @@
+class AddTimezoneToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :timezone, :string
+  end
+end

data/lib/vendors/simple_navigation/renderer/twitter_sidenav.rb

@@ -21,12 +21,10 @@ module Vendors
               options.merge!(method: item.method, confirm: I18n.t('general.questions.are_you_sure'))
             end
             
-            content += content_tag :li, link_to(item.name, item.url, options), class: klass
+            content += link_to(item.name, item.url, options.merge({ class: "list-group-item #{klass}"}))
           end
       
-          ul = content_tag :ul, content, class: 'nav nav-list'
-      
-          content_tag :div, ul, class: 'well sidebar-nav'
+          content_tag :div, content_tag(:div, content, class: 'list-group'), class: 'well sidebar-nav'
         end
       end
     end

data/lib/voluntary.rb

@@ -61,6 +61,8 @@ require 'csv'
 require 'httparty'
 require 'active_model/serializer'
 require 'mongoid_orderable'
+require 'momentjs-rails'
+require 'fullcalendar-rails'
 
 require 'voluntary/navigation'
 

data/lib/voluntary/version.rb

@@ -1,3 +1,3 @@
 module Voluntary
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voluntary
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -654,6 +654,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: fullcalendar-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -728,16 +742,16 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-bootstrap-rails-asset
   requirement: !ruby/object:Gem::Requirement
@@ -1144,7 +1158,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-description: "#Crowdsourcing management system for #RubyOnRails: http://bit.ly/voluntary-0-6-0"
+description: "#Crowdsourcing management system for #RubyOnRails: http://bit.ly/voluntary-0-7-0"
 email:
 - gawlista@gmail.com
 executables: []
@@ -1163,9 +1177,9 @@ files:
 - app/assets/javascripts/voluntary/lib/jquery.cookie.js
 - app/assets/javascripts/voluntary/lib/jquery.multisortable.js
 - app/assets/javascripts/voluntary/lib/jquery.toggle_text.js.coffee
-- app/assets/javascripts/voluntary/lib/moment.js
 - app/assets/javascripts/voluntary/lib/sugar.js
 - app/assets/javascripts/voluntary/likes/list.js.coffee
+- app/assets/javascripts/voluntary/optional_lib/jquery.location_picker.js
 - app/assets/javascripts/voluntary/users.js.coffee
 - app/assets/javascripts/voluntary/workflow/user/index.js.coffee
 - app/assets/stylesheets/voluntary/application.css
@@ -1334,6 +1348,10 @@ files:
 - app/views/stories/steps/_setup_tasks.html.erb
 - app/views/stories/tasks.html.erb
 - app/views/tasks/_collection.html.erb
+- app/views/tasks/_form.html.erb
+- app/views/tasks/edit.html.erb
+- app/views/tasks/index.html.erb
+- app/views/tasks/new.html.erb
 - app/views/tasks/show.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/edit.html.erb
@@ -1422,6 +1440,7 @@ files:
 - db/migrate/20150818151512_create_or_alter_arguments.rb
 - db/migrate/20150821102558_add_vote_column_to_arguments.rb
 - db/migrate/20150823174056_add_likes_count_to_arguments.rb
+- db/migrate/20151022163015_add_timezone_to_users.rb
 - lib/api_constraints.rb
 - lib/applicat/mvc/controller.rb
 - lib/applicat/mvc/controller/error_handling.rb