Skip to content

Merge latest from main into development #3312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
briri merged 5 commits into from
May 1, 2023
Merged

Merge latest from main into development #3312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2918fb6
fix issue with template visibility setting when creating new templates
briri Mar 23, 2023
eba5520
make rubocop happy
briri Mar 23, 2023
9ead17b
Merge pull request #3301 from DMPRoadmap/fix-template-visibility
briri Mar 23, 2023
7d9a1d5
Merge pull request #3309 from DMPRoadmap/development
briri Apr 13, 2023
0cdd9f4
Update README.md
briri Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@ The tool has four main functions:

Click here for the latest [releases](https://github.com/DMPRoadmap/roadmap/releases/).

#### Pre-requisites
Roadmap is a Ruby on Rails application and you will need to have:
* Ruby = 2.7.6
* Rails = 6.1
* MySQL >= 5.0 OR PostgreSQL

Further detail on how to install Ruby on Rails applications are available from the Ruby on Rails site: http://rubyonrails.org.

Further details on how to install MySQL and create your first user and database. Be sure to follow the instructions for your particular environment.
* Install: http://dev.mysql.com/downloads/mysql/
* Create a user: http://dev.mysql.com/doc/refman/5.7/en/create-user.html
* Create the database: http://dev.mysql.com/doc/refman/5.7/en/creating-database.html

You may also find the following resources handy:

* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
* Ruby on Rails Tutorial Book: http://www.railstutorial.org/

#### Installation
See the [Installation Guide](https://github.com/DMPRoadmap/roadmap/wiki/Installation) on the Wiki.

Expand Down
6 changes: 6 additions & 0 deletions app/controllers/org_admin/templates_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

module OrgAdmin
# Controller that handles templates
# rubocop:disable Metrics/ClassLength
class TemplatesController < ApplicationController
include Paginable
include Versionable
Expand Down Expand Up @@ -157,6 +158,10 @@ def edit
def new
authorize Template
@template = current_org.templates.new
# If the Org is a funder set the visibility to Public otherwise set to Organizational
# for Orgs that are both, the admin will see controls on the page to let them choose.
# The default is already 'organisationally_visible' so change it if this is a funder
@template.visibility = Template.visibilities[:publicly_visible] if current_org.funder?
end

# POST /org_admin/templates
Expand Down Expand Up @@ -410,4 +415,5 @@ def get_referrer(template, referrer)
end
end
end
# rubocop:enable Metrics/ClassLength
end
2 changes: 1 addition & 1 deletion app/views/org_admin/templates/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<% else %>
<%
visibility = f.object.visibility
visibility = f.object.funder? ? 'publicly_visible' : 'organisationally_visible' if visibility.nil?
visibility = f.object.org.funder? ? 'publicly_visible' : 'organisationally_visible' if visibility.nil?
%>
<%= f.hidden_field :visibility, value: visibility %>
<% end %>
Expand Down