renamed application to not be ISSAD, now Metamaps
This commit is contained in:
parent
9dec959aee
commit
e702f7023f
14 changed files with 40 additions and 140 deletions
2
Rakefile
2
Rakefile
|
@ -4,4 +4,4 @@
|
||||||
|
|
||||||
require File.expand_path('../config/application', __FILE__)
|
require File.expand_path('../config/application', __FILE__)
|
||||||
|
|
||||||
ISSAD::Application.load_tasks
|
Metamaps::Application.load_tasks
|
||||||
|
|
|
@ -1,86 +0,0 @@
|
||||||
class InMetacodeSetsController < ApplicationController
|
|
||||||
|
|
||||||
before_filter :require_admin
|
|
||||||
|
|
||||||
# GET /in_metacode_sets
|
|
||||||
# GET /in_metacode_sets.json
|
|
||||||
def index
|
|
||||||
@in_metacode_sets = InMetacodeSet.all
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # index.html.erb
|
|
||||||
format.json { render json: @in_metacode_sets }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# GET /in_metacode_sets/1
|
|
||||||
# GET /in_metacode_sets/1.json
|
|
||||||
def show
|
|
||||||
@in_metacode_set = InMetacodeSet.find(params[:id])
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # show.html.erb
|
|
||||||
format.json { render json: @in_metacode_set }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# GET /in_metacode_sets/new
|
|
||||||
# GET /in_metacode_sets/new.json
|
|
||||||
def new
|
|
||||||
@in_metacode_set = InMetacodeSet.new
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # new.html.erb
|
|
||||||
format.json { render json: @in_metacode_set }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# GET /in_metacode_sets/1/edit
|
|
||||||
def edit
|
|
||||||
@in_metacode_set = InMetacodeSet.find(params[:id])
|
|
||||||
end
|
|
||||||
|
|
||||||
# POST /in_metacode_sets
|
|
||||||
# POST /in_metacode_sets.json
|
|
||||||
def create
|
|
||||||
@in_metacode_set = InMetacodeSet.new(params[:in_metacode_set])
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
if @in_metacode_set.save
|
|
||||||
format.html { redirect_to @in_metacode_set, notice: 'In metacode set was successfully created.' }
|
|
||||||
format.json { render json: @in_metacode_set, status: :created, location: @in_metacode_set }
|
|
||||||
else
|
|
||||||
format.html { render action: "new" }
|
|
||||||
format.json { render json: @in_metacode_set.errors, status: :unprocessable_entity }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# PUT /in_metacode_sets/1
|
|
||||||
# PUT /in_metacode_sets/1.json
|
|
||||||
def update
|
|
||||||
@in_metacode_set = InMetacodeSet.find(params[:id])
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
if @in_metacode_set.update_attributes(params[:in_metacode_set])
|
|
||||||
format.html { redirect_to @in_metacode_set, notice: 'In metacode set was successfully updated.' }
|
|
||||||
format.json { head :no_content }
|
|
||||||
else
|
|
||||||
format.html { render action: "edit" }
|
|
||||||
format.json { render json: @in_metacode_set.errors, status: :unprocessable_entity }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# DELETE /in_metacode_sets/1
|
|
||||||
# DELETE /in_metacode_sets/1.json
|
|
||||||
def destroy
|
|
||||||
@in_metacode_set = InMetacodeSet.find(params[:id])
|
|
||||||
@in_metacode_set.destroy
|
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html { redirect_to in_metacode_sets_url }
|
|
||||||
format.json { head :no_content }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -3,10 +3,8 @@ class MainController < ApplicationController
|
||||||
include MapsHelper
|
include MapsHelper
|
||||||
include UsersHelper
|
include UsersHelper
|
||||||
include SynapsesHelper
|
include SynapsesHelper
|
||||||
|
|
||||||
before_filter :require_user, only: [:invite]
|
|
||||||
|
|
||||||
respond_to :html, :js, :json
|
respond_to :html, :json
|
||||||
|
|
||||||
# home page
|
# home page
|
||||||
def home
|
def home
|
||||||
|
@ -22,11 +20,6 @@ class MainController < ApplicationController
|
||||||
respond_with(@maps, @current)
|
respond_with(@maps, @current)
|
||||||
end
|
end
|
||||||
|
|
||||||
# /request
|
|
||||||
def requestinvite
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
### SEARCHING ###
|
### SEARCHING ###
|
||||||
|
|
||||||
# get /search/topics?term=SOMETERM
|
# get /search/topics?term=SOMETERM
|
||||||
|
|
|
@ -16,14 +16,14 @@ class MetacodeSetsController < ApplicationController
|
||||||
### SHOW IS NOT CURRENTLY IN USE
|
### SHOW IS NOT CURRENTLY IN USE
|
||||||
# GET /metacode_sets/1
|
# GET /metacode_sets/1
|
||||||
# GET /metacode_sets/1.json
|
# GET /metacode_sets/1.json
|
||||||
def show
|
# def show
|
||||||
@metacode_set = MetacodeSet.find(params[:id])
|
# @metacode_set = MetacodeSet.find(params[:id])
|
||||||
|
#
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
format.html # show.html.erb
|
# format.html # show.html.erb
|
||||||
format.json { render json: @metacode_set }
|
# format.json { render json: @metacode_set }
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
|
|
||||||
# GET /metacode_sets/new
|
# GET /metacode_sets/new
|
||||||
# GET /metacode_sets/new.json
|
# GET /metacode_sets/new.json
|
||||||
|
|
|
@ -23,14 +23,14 @@ class MetacodesController < ApplicationController
|
||||||
### SHOW IS CURRENTLY DISABLED
|
### SHOW IS CURRENTLY DISABLED
|
||||||
# GET /metacodes/1
|
# GET /metacodes/1
|
||||||
# GET /metacodes/1.json
|
# GET /metacodes/1.json
|
||||||
def show
|
# def show
|
||||||
@metacode = Metacode.find(params[:id])
|
# @metacode = Metacode.find(params[:id])
|
||||||
|
#
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
format.html # show.html.erb
|
# format.html # show.html.erb
|
||||||
format.json { render json: @metacode }
|
# format.json { render json: @metacode }
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
|
|
||||||
# GET /metacodes/new
|
# GET /metacodes/new
|
||||||
# GET /metacodes/new.json
|
# GET /metacodes/new.json
|
||||||
|
@ -84,13 +84,13 @@ class MetacodesController < ApplicationController
|
||||||
### DESTROY IS CURRENTLY DISABLED
|
### DESTROY IS CURRENTLY DISABLED
|
||||||
# DELETE /metacodes/1
|
# DELETE /metacodes/1
|
||||||
# DELETE /metacodes/1.json
|
# DELETE /metacodes/1.json
|
||||||
def destroy
|
# def destroy
|
||||||
@metacode = Metacode.find(params[:id])
|
# @metacode = Metacode.find(params[:id])
|
||||||
@metacode.destroy
|
# @metacode.destroy
|
||||||
|
#
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
format.html { redirect_to metacodes_url }
|
# format.html { redirect_to metacodes_url }
|
||||||
format.json { head :no_content }
|
# format.json { head :no_content }
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# This file is used by Rack-based servers to start the application.
|
# This file is used by Rack-based servers to start the application.
|
||||||
|
|
||||||
require ::File.expand_path('../config/environment', __FILE__)
|
require ::File.expand_path('../config/environment', __FILE__)
|
||||||
run ISSAD::Application
|
run Metamaps::Application
|
||||||
|
|
|
@ -9,7 +9,7 @@ if defined?(Bundler)
|
||||||
# Bundler.require(:default, :assets, Rails.env)
|
# Bundler.require(:default, :assets, Rails.env)
|
||||||
end
|
end
|
||||||
|
|
||||||
module ISSAD
|
module Metamaps
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
# Settings in config/environments/* take precedence over those specified here.
|
# Settings in config/environments/* take precedence over those specified here.
|
||||||
# Application configuration should go into files in config/initializers
|
# Application configuration should go into files in config/initializers
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
require File.expand_path('../application', __FILE__)
|
require File.expand_path('../application', __FILE__)
|
||||||
|
|
||||||
# Initialize the rails application
|
# Initialize the rails application
|
||||||
ISSAD::Application.initialize!
|
Metamaps::Application.initialize!
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ISSAD::Application.configure do
|
Metamaps::Application.configure do
|
||||||
# Settings specified here will take precedence over those in config/application.rb
|
# Settings specified here will take precedence over those in config/application.rb
|
||||||
|
|
||||||
# In the development environment your application's code is reloaded on
|
# In the development environment your application's code is reloaded on
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ISSAD::Application.configure do
|
Metamaps::Application.configure do
|
||||||
# Settings specified here will take precedence over those in config/application.rb
|
# Settings specified here will take precedence over those in config/application.rb
|
||||||
|
|
||||||
# Code is not reloaded between requests
|
# Code is not reloaded between requests
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ISSAD::Application.configure do
|
Metamaps::Application.configure do
|
||||||
# Settings specified here will take precedence over those in config/application.rb
|
# Settings specified here will take precedence over those in config/application.rb
|
||||||
|
|
||||||
# The test environment is used exclusively to run your application's
|
# The test environment is used exclusively to run your application's
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
# If you change this key, all old signed cookies will become invalid!
|
# If you change this key, all old signed cookies will become invalid!
|
||||||
# Make sure the secret is at least 30 characters and all random,
|
# Make sure the secret is at least 30 characters and all random,
|
||||||
# no regular words or you'll be exposed to dictionary attacks.
|
# no regular words or you'll be exposed to dictionary attacks.
|
||||||
ISSAD::Application.config.secret_token = '267c8a84f63963282f45bc3010eaddf027abfab58fc759d6e239c8005f85ee99d6d01b1ab6394cdee9ca7f8c9213a0cf91d3d8d3350f096123e2caccbcc0924f'
|
Metamaps::Application.config.secret_token = '267c8a84f63963282f45bc3010eaddf027abfab58fc759d6e239c8005f85ee99d6d01b1ab6394cdee9ca7f8c9213a0cf91d3d8d3350f096123e2caccbcc0924f'
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Be sure to restart your server when you modify this file.
|
# Be sure to restart your server when you modify this file.
|
||||||
|
|
||||||
ISSAD::Application.config.session_store :cookie_store, key: '_ISSAD_session'
|
Metamaps::Application.config.session_store :cookie_store, key: '_Metamaps_session'
|
||||||
|
|
||||||
# Use the database for sessions instead of the cookie-based default,
|
# Use the database for sessions instead of the cookie-based default,
|
||||||
# which shouldn't be used to store highly confidential information
|
# which shouldn't be used to store highly confidential information
|
||||||
# (create the session table with "rails generate session_migration")
|
# (create the session table with "rails generate session_migration")
|
||||||
# ISSAD::Application.config.session_store :active_record_store
|
# Metamaps::Application.config.session_store :active_record_store
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ISSAD::Application.routes.draw do
|
Metamaps::Application.routes.draw do
|
||||||
|
|
||||||
root to: 'main#home', via: :get
|
root to: 'main#home', via: :get
|
||||||
|
|
||||||
|
@ -12,22 +12,19 @@ ISSAD::Application.routes.draw do
|
||||||
match '/search/mappers', to: 'main#searchmappers', via: :get, as: :searchmappers
|
match '/search/mappers', to: 'main#searchmappers', via: :get, as: :searchmappers
|
||||||
match '/search/synapses', to: 'main#searchsynapses', via: :get, as: :searchsynapses
|
match '/search/synapses', to: 'main#searchsynapses', via: :get, as: :searchsynapses
|
||||||
|
|
||||||
resources :in_metacode_sets
|
resources :mappings, except: [:index, :new, :edit]
|
||||||
resources :metacode_sets, :except => [:show]
|
resources :metacode_sets, :except => [:show]
|
||||||
resources :metacodes, :except => [:show, :destroy]
|
resources :metacodes, :except => [:show, :destroy]
|
||||||
|
resources :synapses, except: [:index, :new, :edit]
|
||||||
resources :topics, except: [:index, :new, :edit] do
|
resources :topics, except: [:index, :new, :edit] do
|
||||||
get :autocomplete_topic, :on => :collection
|
get :autocomplete_topic, :on => :collection
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :synapses, except: [:index, :new, :edit]
|
|
||||||
|
|
||||||
match 'maps/active', to: 'maps#index', via: :get, as: :activemaps
|
match 'maps/active', to: 'maps#index', via: :get, as: :activemaps
|
||||||
match 'maps/featured', to: 'maps#index', via: :get, as: :featuredmaps
|
match 'maps/featured', to: 'maps#index', via: :get, as: :featuredmaps
|
||||||
match 'maps/new', to: 'maps#index', via: :get, as: :newmaps
|
match 'maps/new', to: 'maps#index', via: :get, as: :newmaps
|
||||||
match 'maps/mappers/:id', to: 'maps#index', via: :get, as: :usermaps
|
match 'maps/mappers/:id', to: 'maps#index', via: :get, as: :usermaps
|
||||||
match 'maps/topics/:id', to: 'maps#index', via: :get, as: :topicmaps
|
match 'maps/topics/:id', to: 'maps#index', via: :get, as: :topicmaps
|
||||||
|
|
||||||
|
|
||||||
resources :maps, except: [:new, :edit]
|
resources :maps, except: [:new, :edit]
|
||||||
match 'maps/:id/embed', to: 'maps#embed', via: :get, as: :embed
|
match 'maps/:id/embed', to: 'maps#embed', via: :get, as: :embed
|
||||||
|
|
||||||
|
@ -36,9 +33,5 @@ ISSAD::Application.routes.draw do
|
||||||
get "sign_out", :to => "devise/sessions#destroy"
|
get "sign_out", :to => "devise/sessions#destroy"
|
||||||
end
|
end
|
||||||
match 'user/updatemetacodes', to: 'users#updatemetacodes', via: :post, as: :updatemetacodes
|
match 'user/updatemetacodes', to: 'users#updatemetacodes', via: :post, as: :updatemetacodes
|
||||||
|
resources :users, except: [:index, :destroy]
|
||||||
resources :users, except: [:index]
|
|
||||||
|
|
||||||
resources :mappings, except: [:index, :new, :edit]
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue