Update source: pull from git
This commit is contained in:
1 parent
4f38074932
commit
2842001a3b
7 files changed
+35
-7
No files matched your search
@@ -13,6 +13,8 @@ class Site
|
||||
field :school
|
||||
field :department
|
||||
|
||||
field :up_to_date, :type => Boolean
|
||||
|
||||
def generate_keys
|
||||
private_key = OpenSSL::PKey::RSA.generate(2048)
|
||||
self.public_key = private_key.public_key.to_s
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
<% if @site && @site.registered? %>
|
||||
<%= t('admin.registered') %>
|
||||
<% else %>
|
||||
<%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" +
|
||||
{:site => {:school => @site.school, :department => @site.department}}.to_query,
|
||||
:target => '_blank' %>
|
||||
<% end %>
|
||||
@@ -0,0 +1,5 @@
|
||||
<% if @site.up_to_date %>
|
||||
<%= t('admin.up_to_date') %>
|
||||
<% else %>
|
||||
<%= link_to t(:update), site_update_path %>
|
||||
<% end %>
|
||||
@@ -1,7 +1,3 @@
|
||||
<% if @site && @site.registered? %>
|
||||
registered
|
||||
<% else %>
|
||||
<%= link_to 'register', "http://#{APP_CONFIG['store_ip']}/user/sites/register?" +
|
||||
{:site => {:school => @site.school, :department => @site.department}}.to_query,
|
||||
:target => '_blank' %>
|
||||
<% end %>
|
||||
<%= render 'registration' %>
|
||||
|
||||
<%= render 'update' %>
|
||||
Reference in new issue
Block a user