Download as
Browse Code »

Commit 008118fb28e1eaf2f50a3f3dba3f5efc41d4da79

Authored by AntonioTerceiro
1 parent 55952f37
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem36: displaying list of pending requests so the user can act on them 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1514 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 8 changed files with 40 additions and 0 deletions   Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
  Diff comments   View file @008118f
... ... @@ -2,6 +2,10 @@ class ProfileEditorController < MyProfileController
2 2  
3 3 # protect 'edit_profile', :profile, :only => [:index, :edit]
4 4  
  5 + def index
  6 + @pending_tasks = profile.tasks.pending
  7 + end
  8 +
5 9 helper :profile
6 10  
7 11 # edits the profile info (posts back)
... ...
app/views/profile_editor/_pending_tasks.rhtml 0 → 100644
  Diff comments   View file @008118f
... ... @@ -0,0 +1,9 @@
  1 +<% unless @pending_tasks.empty? %>
  2 + <div class='pending-tasks'>
  3 + <h2><%= _('You have pending requests') %></h2>
  4 + <ul>
  5 + <%= @pending_tasks.map {|item| content_tag('li', item.description)} %>
  6 + </ul>
  7 + <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
  8 + </div>
  9 +<% end %>
... ...
app/views/profile_editor/index.rhtml
  Diff comments   View file @008118f
1 1 <h1 class="block-title"><%= _('My profile') %></h1>
2 2  
  3 +<%= render :partial => 'pending_tasks' %>
  4 +
3 5 <%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image' %>
4 6  
5 7 <%= display_profile_info(profile) %>
... ...
public/designs/icons/default/README
  Diff comments   View file @008118f
... ... @@ -39,6 +39,7 @@ gtk-go-down.png Nuovo stock/
39 39 gnome-search.png Nuovo apps/
40 40 gtk-ok.png Nuovo stock/
41 41 password.png Nuovo apps/
  42 +stock_todo.png Nuovo stock/
42 43 ### END OF ICONS LISTING ###
43 44  
44 45 Icons made for Noosfero, by The Noosfero Team:
... ...
public/designs/icons/default/stock_todo.png 0 → 100644
View file @008118f

821 Bytes
public/designs/icons/default/style.css
  Diff comments   View file @008118f
... ... @@ -36,3 +36,4 @@
36 36 .icon-menu-logout { background-image: url(exit-HC.gif) }
37 37 .icon-menu-search { background-image: url(search-HC.gif) }
38 38 .icon-menu-ed-design { background-image: url(edit-design-HC.gif) }
  39 +.icon-todo { background-image: url(stock_todo.png); }
... ...
public/stylesheets/common.css
  Diff comments   View file @008118f
... ... @@ -444,3 +444,13 @@ div.auto-complete li.selected {
444 444 background: #B8CFE7;
445 445 color: #204A87;
446 446 }
  447 +
  448 +/* pending tasks list */
  449 +
  450 +div.pending-tasks {
  451 + background: #B8CFE7;
  452 + color: #204A87;
  453 + border: 2px solid #204A87;
  454 + padding: 2px;
  455 + margin: 1em;
  456 +}
... ...
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @008118f
... ... @@ -31,6 +31,19 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
31 31 assert_tag :tag => 'td', :content => 'my contact information'
32 32 end
33 33  
  34 + def test_should_present_pending_tasks_in_index
  35 + ze = Profile['ze'] # a fixture >:-(
  36 + @controller.expects(:profile).returns(ze).at_least_once
  37 + tasks = mock
  38 + pending = []
  39 + pending.expects(:empty?).returns(false) # force the display of the pending tasks list
  40 + tasks.expects(:pending).returns(pending)
  41 + ze.expects(:tasks).returns(tasks)
  42 + get :index, :profile => ze.identifier
  43 + assert_same pending, assigns(:pending_tasks)
  44 + assert_tag :tag => 'div', :attributes => { :class => 'pending-tasks' }, :descendant => { :tag => 'a', :attributes => { :href => '/myprofile/ze/tasks' } }
  45 + end
  46 +
34 47 def test_edit_person_info
35 48 person = User.create(:login => 'test_profile', :email => 'test@noosfero.org', :password => 'test', :password_confirmation => 'test').person
36 49  
... ...