scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-29 08:24:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix typo

Browse source
This commit is contained in:
zmagod 2017-11-03 10:11:23 +01:00
parent 5bc38414d1
commit 55d05b013b
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/schema.rb
View file

@ -914,7 +914,7 @@ ActiveRecord::Schema.define(version: 20171026090804) do
CASE CASE
WHEN (teams.created_by_id = user_teams.user_id) THEN false WHEN (teams.created_by_id = user_teams.user_id) THEN false
ELSE true ELSE true
END AS can_be_leaved, END AS can_be_left,
user_teams.id AS user_team_id, user_teams.id AS user_team_id,
user_teams.user_id user_teams.user_id
FROM (teams FROM (teams

2
db/views/datatables_teams_v01.sql
View file

@ -7,7 +7,7 @@ SELECT
FROM user_teams FROM user_teams
WHERE user_teams.team_id = teams.id WHERE user_teams.team_id = teams.id
) AS members, ) AS members,
CASE WHEN teams.created_by_id = user_teams.user_id THEN false ELSE true END AS can_be_leaved, CASE WHEN teams.created_by_id = user_teams.user_id THEN false ELSE true END AS can_be_left,
user_teams.id AS user_team_id, user_teams.id AS user_team_id,
user_teams.user_id AS user_id user_teams.user_id AS user_id
FROM teams INNER JOIN user_teams ON teams.id=user_teams.team_id FROM teams INNER JOIN user_teams ON teams.id=user_teams.team_id

1
spec/models/datatables/teams_spec.rb
View file

@ -8,6 +8,7 @@ RSpec.describe Datatables::DatatablesTeam, type: :model do
it { should have_db_column :role } it { should have_db_column :role }
it { should have_db_column :user_team_id } it { should have_db_column :user_team_id }
it { should have_db_column :user_id } it { should have_db_column :user_id }
it { should have_db_column :can_be_left }
end end
describe 'is readonly' do describe 'is readonly' do

4
spec/support/api/schemas/teams.json
View file

@ -5,13 +5,13 @@
"teams": { "teams": {
"type": "array", "type": "array",
"items":{ "items":{
"required": ["id", "name", "members", "role", "can_be_leaved", "user_team_id"], "required": ["id", "name", "members", "role", "can_be_left", "user_team_id"],
"properties": { "properties": {
"id": { "type": "integer" }, "id": { "type": "integer" },
"name": { "type": "string" }, "name": { "type": "string" },
"members": { "type": "integer" }, "members": { "type": "integer" },
"role": { "type": "integer" }, "role": { "type": "integer" },
"can_be_leaved": { "type": "boolean" }, "can_be_left": { "type": "boolean" },
"user_team_id": { "type": "integer" }, "user_team_id": { "type": "integer" },
"user_id": { "type": "integer" } "user_id": { "type": "integer" }
} }