Skip to content

Removed USDA fields from species; fixed permissions on user pages #75

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

Closed
MarvinJ wants to merge 11 commits into from
Closed

Removed USDA fields from species; fixed permissions on user pages #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fa35f20
second
May 22, 2014
6a6fdb9
Merge branch 'master' of https://github.com/MarvinJ/bety
May 22, 2014
94f7c36
third
May 27, 2014
f408113
fixed indentation and open links in new window
dlebauer Jun 4, 2014
f6c7339
Merge pull request #1 from dlebauer/patch-1
MarvinJ Jun 4, 2014
1e415f7
final
MarvinJ Jun 5, 2014
bb6f0ef
first version
MarvinJ Jun 17, 2014
7943e71
second
MarvinJ Jun 17, 2014
f17235a
final
MarvinJ Jun 19, 2014
ba749ae
first commit
MarvinJ Jun 20, 2014
3b82569
third
MarvinJ Jun 25, 2014
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
5 changes: 4 additions & 1 deletion app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ def index
:per_page => params[:DataTables_Table_0_length]
)
else
@users = User.find(current_user.id)
@users = User.where("id = #{current_user.id}").paginate(
:page => params[:page],
:per_page => params[:DataTables_Table_0_length]
)
end

respond_to do |format|
Expand Down
3 changes: 1 addition & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,8 @@
<li><%= link_to "Species", species_index_path %></li>
<li><%= link_to "Traits", traits_path %></li>
<li><%= link_to "Treatments", treatments_path %></li>
<% if current_user != nil && current_user.page_access_level <= 2 %>
<%# if current_user != nil && current_user.page_access_level <= 2 %>
<li><%= link_to "Users", users_path %></li>
<% end %>
<li><%= link_to "Variables", variables_path %></li>
<li><%= link_to "Yields", yields_path %></li>
</ul>
Expand Down
25 changes: 20 additions & 5 deletions app/views/sites/_index_table.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<th class="sorting" role="columnheader" aria-controls="DataTables_Table_0" style="width: 40px"><%= sortable "sites.lat", "Lat" %></th>
<th class="sorting" role="columnheader" aria-controls="DataTables_Table_0" style="width: 40px"><%= sortable "sites.lon", "Lon" %></th>
<th class="sorting" role="columnheader" aria-controls="DataTables_Table_0" style="width: 40px"><%= sortable "sites.espg", "Espg" %></th>
<th class="sorting" role="columnheader" aria-controls="
DataTables_Table_0" style="width: 160px"><%= sortable "sites.map", "Map" %></th>
<th role="columnheader" aria-controls="DataTables_Table_0" style="width: 162px">Actions</th>
</tr>
</thead>
Expand All @@ -23,15 +25,29 @@
<td class="center"><%= site.lat %></td>
<td class="center"><%= site.lon %></td>
<td class="center"><%= site.espg %></td>
<td><%= link_to_prototype_window("map", "#{site.id}", { :className => "alphacube", :width => "625", :height => "525", :zIndex => "100", :resizable => "true", :title => "#{site.sitename}", :draggable => "true", :wiredDrag => "true", :url => "/sites/map?id=#{site.id}" }) %> <br />
<td><%= link_to_prototype_window("map", "#{site.id}", { :className => "alphacube", :width => "625", :height => "525", :zIndex => "100", :resizable => "true", :title => "#{site.sitename}", :draggable => "true", :wiredDrag => "true", :url => "/sites/map?id=#{site.id}" }) %> <br />

</td>
<% if !session["citation"].nil? %>
<td><%= link_to 'Link', {:action => "linked", :id => site.id }, :remote => true %></td>
<% end %>
<td><%= link_to 'Show', site %></td>
<td><%= link_to 'Edit', edit_site_path(site) %></td>
<td><%= link_to 'Destroy', site, :confirm => 'Are you sure?', :method => :delete %></td>
<td class="center ">
<!-- SHOW -->
<%= link_to site, :class => "button button-small", :alt => "show" do %>
<i class="icon-zoom-in"></i>
<% end %>
<!-- EDIT -->
<%= link_to edit_site_path(site), :class => "button button-small", :alt => "edit" do %>
<i class="icon-edit"></i>
<% end %>
<!-- DELETE -->
<% if current_user.page_access_level == 1 %>
<%= link_to site, :method => :delete, :type => 'site', :confirm => 'Are you sure?', :class=> 'button button-small button-danger', :alt => "delete" do %>
<i class="icon-trash"></i>
<% end %>
<% end %>
</td>

</tr>
<% end %>
</tbody>
Expand All @@ -51,4 +67,3 @@
</div>
</div>
</div>

17 changes: 8 additions & 9 deletions app/views/sites/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
</script>

<div class="content">
<div class="container">
<div class="sixteen columns">
<div class="container">
<div class="sixteen columns">
<div id="linked">
<%= render 'linked' %>
</div>

<header>
<h1>Listing Sites</h1>
</header>
<header>
<h1>Listing Sites</h1>
</header>
<div id="process_container">
<div id="back"><%= link_to '<< Citations', citations_path %></div>
<div id="new"><%= link_to 'New Site', new_site_path, :class => "button button-primary" %></div>
Expand All @@ -30,7 +30,6 @@

<div id="simple_search_table" class="simple_search_table_1"><%= render 'index_table' %></div>

</div> <!-- class="sixteen columns" -->
</div> <!-- container -->
</div>

</div> <!-- class="sixteen columns" -->
</div> <!-- container -->
</div>
Loading