Commit fbb90275ae027477b69b4a0c027c59989562b576
Exists in
master
and in
4 other branches
Merge branch 'fix_bugs' into 'master'
Fix bugs See merge request !11
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
lib/ext/communities_block.rb
| ... | ... | @@ -22,7 +22,7 @@ class CommunitiesBlock |
| 22 | 22 | valid_communities_string = Community.get_valid_communities_string |
| 23 | 23 | Community.all.each{|community| delete_communities << community.id unless eval(valid_communities_string)} |
| 24 | 24 | |
| 25 | - visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities]) | |
| 25 | + visible_profiles = visible_profiles.where(["profiles.id NOT IN (?)", delete_communities]) unless delete_communities.empty? | |
| 26 | 26 | |
| 27 | 27 | if !prioritize_profiles_with_image |
| 28 | 28 | return visible_profiles.all( | ... | ... |
po/pt/software_communities.po
| ... | ... | @@ -179,7 +179,7 @@ msgstr " campo finalidade em branco." |
| 179 | 179 | |
| 180 | 180 | #: plugins/software_communities/lib/create_software.rb:48 |
| 181 | 181 | msgid " this finality:<p><em>%{finality}</em></p>" |
| 182 | -msgstr "esta finalidade:<p><em>%{finality}</em></p>" | |
| 182 | +msgstr " esta finalidade:<p><em>%{finality}</em></p>" | |
| 183 | 183 | |
| 184 | 184 | #: plugins/software_communities/lib/create_software.rb:68 |
| 185 | 185 | msgid "%{requestor} wants to create software %{subject}" | ... | ... |
views/profile/index.html.erb
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | <% end %> |
| 12 | 12 | |
| 13 | 13 | <div class="page-profile-header"> |
| 14 | - <%= render "blocks/profile_info_actions/join_leave_community" %> | |
| 14 | + <%= render "blocks/profile_info_actions/join_leave_community" if profile.class == "Community" %> | |
| 15 | 15 | <% if !user.nil? && user.has_permission?('edit_profile', profile) %> |
| 16 | 16 | <div class="control-panel-button"> |
| 17 | 17 | <%= button :control_panel, _('Control Panel'), profile.admin_url %> | ... | ... |