alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop mods with new layout stuff

This commit is contained in:
Harry Bomrah 2014-08-08 18:07:39 +08:00
parent df934ae584
commit bbc171fc7c
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/member-selection.js
View File

@ -125,7 +125,7 @@ $(document).ready(function() {
var user_ids = [], var user_ids = [],
role_ids =[], role_ids =[],
users = $('.selected_user input[type="checkbox"]:checked'), users = $('.selected_user input[type="checkbox"]:checked'),
roles = $('.selected_role input[type="checkbox"]:checked') roles = $('.selected_role input[type="checkbox"]:checked');
users.each(function() { users.each(function() {
user_ids.push($(this).parent().attr('id')); user_ids.push($(this).parent().attr('id'));

2
config/initializers/keyword_constraint.rb
View File

@ -1,6 +1,6 @@
class KeywordConstraint class KeywordConstraint
def matches?(request) def matches?(request)
keywords = ["/admin", "//desktop", "/user", "/signup", "/login"] keywords = ["/admin", "/desktop", "/user", "/signup", "/login"]
keywords.all? { |k| !request.url.include?(k) } keywords.all? { |k| !request.url.include?(k) }
end end
end end

2
config/routes.rb
View File

@ -6,8 +6,6 @@ Orbit::Application.routes.draw do
get "logout", to: "sessions#destroy", as: "logout" get "logout", to: "sessions#destroy", as: "logout"
get "desktop" => 'desktop#index'
get "/pages/edit_view" => "pages#edit_view" get "/pages/edit_view" => "pages#edit_view"
get "/pages/preview" => "pages#preview" get "/pages/preview" => "pages#preview"
get "/pages/get_categories" => "pages#get_categories" get "/pages/get_categories" => "pages#get_categories"