forked from saurabh/orbit4-5
now only registered websites can update via update manager
This commit is contained in:
parent
466f08d4f6
commit
0623541d94
|
@ -55,9 +55,6 @@ class Admin::SitesController < OrbitAdminController
|
||||||
def preference
|
def preference
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_manager
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_orbit
|
def update_orbit
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -80,6 +77,7 @@ class Admin::SitesController < OrbitAdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_manager
|
def update_manager
|
||||||
|
@store_permissions = check_store_permissions
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_update_history
|
def get_update_history
|
||||||
|
@ -94,6 +92,8 @@ class Admin::SitesController < OrbitAdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_orbit
|
def update_orbit
|
||||||
|
store_permissions = check_store_permissions
|
||||||
|
if store_permissions["permission_granted"]
|
||||||
result = ""
|
result = ""
|
||||||
need_stash = %x(git diff).blank?
|
need_stash = %x(git diff).blank?
|
||||||
%x(git stash) unless need_stash
|
%x(git stash) unless need_stash
|
||||||
|
@ -109,6 +109,9 @@ class Admin::SitesController < OrbitAdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
render :text => result
|
render :text => result
|
||||||
|
else
|
||||||
|
render :json => store_permissions.to_json
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def restart_server
|
def restart_server
|
||||||
|
|
|
@ -63,7 +63,7 @@ class Admin::StoreController < OrbitAdminController
|
||||||
|
|
||||||
private
|
private
|
||||||
def store_url
|
def store_url
|
||||||
@store_url = "http://store.tp.rulingcom.com"
|
@store_url = OrbitStore::URL
|
||||||
# @store_url = "http://localhost:3000"
|
# @store_url = "http://localhost:3000"
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -81,5 +81,4 @@ class OrbitAdminController < ApplicationController
|
||||||
@current_user_is_sub_manager = current_user.is_sub_manager?(@module_app) rescue false
|
@current_user_is_sub_manager = current_user.is_sub_manager?(@module_app) rescue false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
require "uri"
|
||||||
|
require "net/http"
|
||||||
module OrbitBackendHelper
|
module OrbitBackendHelper
|
||||||
|
|
||||||
def self.included(base)
|
def self.included(base)
|
||||||
|
@ -152,6 +154,37 @@ module OrbitBackendHelper
|
||||||
@user_has_privileges
|
@user_has_privileges
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def check_store_permissions #checks with the store if it has proper access and rights to access store
|
||||||
|
store_permission = {}
|
||||||
|
store_token = current_site.store_token rescue nil
|
||||||
|
if !store_token.nil?
|
||||||
|
params_to_send = {'store_token' => current_site.store_token}
|
||||||
|
uri = URI.parse(OrbitStore::URL)
|
||||||
|
http = Net::HTTP.new(uri.host,uri.port)
|
||||||
|
request = Net::HTTP::Get.new("/site/permissions")
|
||||||
|
request.body = params_to_send.to_query
|
||||||
|
response = http.request(request)
|
||||||
|
data = JSON.parse(response.body)
|
||||||
|
if !data["success"]
|
||||||
|
case data["error"]
|
||||||
|
when "INVALID_SITE_TOKEN"
|
||||||
|
current_site.store_token = nil
|
||||||
|
current_site.save
|
||||||
|
end
|
||||||
|
store_permission["permission_granted"] = false
|
||||||
|
store_permission["error"] = data["error"]
|
||||||
|
store_permission["message"] = data["message"]
|
||||||
|
else
|
||||||
|
store_permission["permission_granted"] = true
|
||||||
|
end
|
||||||
|
else
|
||||||
|
store_permission["permission_granted"] = false
|
||||||
|
store_permission["error"] = "SITE_NOT_REGISTERED"
|
||||||
|
store_permission["message"] = "Site not registered."
|
||||||
|
end
|
||||||
|
store_permission
|
||||||
|
end
|
||||||
|
|
||||||
def render_401
|
def render_401
|
||||||
render "public/401"
|
render "public/401"
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
class OrbitStore
|
||||||
|
URL = "http://store.tp.rulingcom.com"
|
||||||
|
end
|
|
@ -94,6 +94,25 @@
|
||||||
<span class="break"></span>
|
<span class="break"></span>
|
||||||
<span class="panel-title"><%= t("update_manager_.available_updates") %></span>
|
<span class="panel-title"><%= t("update_manager_.available_updates") %></span>
|
||||||
<span id="num_new_updates" class="badge badge-important pull-right"></span>
|
<span id="num_new_updates" class="badge badge-important pull-right"></span>
|
||||||
|
<% if !@store_permissions["permission_granted"] %>
|
||||||
|
<span class="break pull-right"></span>
|
||||||
|
<small class="pull-right text-error">
|
||||||
|
<% if @store_permissions["message"].size > 30 %>
|
||||||
|
<a class="tooltipalert text-error" href="#"
|
||||||
|
onclick="return false;" title="<%= @store_permissions["message"] %>"><%= @store_permissions["message"][0..17] + "..." %></a>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$('.tooltipalert').tooltip({
|
||||||
|
position: {
|
||||||
|
my: "center bottom-4",
|
||||||
|
at: "center top"
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<% else %>
|
||||||
|
<%= @store_permissions["message"] %>
|
||||||
|
<% end %>
|
||||||
|
</small>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="pannel-body">
|
<div class="pannel-body">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
|
@ -104,7 +123,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="height: 55px;">
|
<div style="height: 55px;">
|
||||||
|
<% if @store_permissions["permission_granted"] %>
|
||||||
<button id="update_btn" class="btn btn-primary pull-right" style="margin: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.system_update") %></button>
|
<button id="update_btn" class="btn btn-primary pull-right" style="margin: 10px;"><i class="icon-inbox icon-white"></i> <%= t("update_manager_.system_update") %></button>
|
||||||
|
<% else %>
|
||||||
|
<a href="/<%= I18n.locale.to_s %>/admin/designs" class="pull-right">Please register here.</a>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="update_status">
|
<div id="update_status">
|
||||||
|
@ -113,6 +136,24 @@
|
||||||
<i class="icon-info-sign"></i>
|
<i class="icon-info-sign"></i>
|
||||||
<span class="break"></span>
|
<span class="break"></span>
|
||||||
<span class="panel-title"><%= t("update_manager_.update_status") %></span>
|
<span class="panel-title"><%= t("update_manager_.update_status") %></span>
|
||||||
|
<% if !@store_permissions["permission_granted"] %>
|
||||||
|
<small class="pull-right text-error">
|
||||||
|
<% if @store_permissions["message"].size > 30 %>
|
||||||
|
<a class="tooltipalert text-error" href="#"
|
||||||
|
onclick="return false;" title="<%= @store_permissions["message"] %>"><%= @store_permissions["message"][0..17] + "..." %></a>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$('.tooltipalert').tooltip({
|
||||||
|
position: {
|
||||||
|
my: "center bottom-4",
|
||||||
|
at: "center top"
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<% else %>
|
||||||
|
<%= @store_permissions["message"] %>
|
||||||
|
<% end %>
|
||||||
|
</small>
|
||||||
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
<div class="pannel-body">
|
<div class="pannel-body">
|
||||||
<div id="update_done" class="alert alert-success" style="font-size: 16px; text-align: center; margin: 0px;">
|
<div id="update_done" class="alert alert-success" style="font-size: 16px; text-align: center; margin: 0px;">
|
||||||
|
|
Loading…
Reference in New Issue