Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Assumes installation within a virtual directory
3. `./bin/install_xapian.sh 1.4.14`

## Deployment
Run `deploy/update_dbdb_app.sh` on the production machine to fetch new changes, run migrations, and restart the wsgi server
Run `deploy/update_dbdb_app.sh` on the production machine to fetch new changes, run migrations, and restart the wsgi server.
2 changes: 1 addition & 1 deletion dbdb/core/management/commands/create_twitter_cards.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Command(BaseCommand):

def add_arguments(self, parser):
parser.add_argument('system', metavar='S', type=str, nargs='?',
help='System to force twiter card creation')
help='System to force twitter card creation')
parser.add_argument('--skip-errors', action='store_true',
help="Ignore errors and keep processing")
return
Expand Down
2 changes: 1 addition & 1 deletion dbdb/core/management/commands/fix_acls.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def handle(self, *args, **options):
if user.username == "developer" or user.is_superuser: continue

systems = set()
# Find what systems this user has editted
# Find what systems this user has edited
for ver in SystemVersion.objects.filter(creator=user):
if not ver.system in systems:
acl = SystemACL(system=ver.system, user=user)
Expand Down
2 changes: 1 addition & 1 deletion dbdb/core/management/commands/generate_searchtext.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Command(BaseCommand):

def add_arguments(self, parser):
parser.add_argument('system', metavar='S', type=str, nargs='?',
help='System to force search text genration')
help='System to force search text generation')
return

def handle(self, *args, **options):
Expand Down
2 changes: 1 addition & 1 deletion dbdb/core/management/commands/load_initial_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Command(BaseCommand):
help = '''Creates a fixture based on the files on initial_data folder
This should be run only for a newly created system deployment and if there's no better database dump to apply.

Please be sure you have a databasees.csv file in initial_data folder along with spring2017 and spring2016
Please be sure you have a databases.csv file in initial_data folder along with spring2017 and spring2016
'''

def handle(self, *args, **options):
Expand Down
2 changes: 1 addition & 1 deletion dbdb/core/management/commands/process_visits.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def handle(self, *args, **options):
#sys.exit(1)

self.stdout.write("# of Users: %d" % next_user_idx)
self.stdout.write("# of Sytems: %d (total=%d)" % (next_system_idx, system_cnt))
self.stdout.write("# of Systems: %d (total=%d)" % (next_system_idx, system_cnt))

data = np.zeros((next_user_idx, next_system_idx))
for user_idx in all_visits.keys():
Expand Down
2 changes: 1 addition & 1 deletion dbdb/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ def generate_searchtext(self):
words += [tag.name, tag.name.replace("-", "")]

# It's debatable whether people actually want to do keyword search for the supported languages
# From the logs, it looks like people really want to know the language a DBMS was written in
# From the logs, it looks like people really want to know the language in which a DBMS was written
# words += [x.name for x in self.meta.supported_languages.all()]
# words += [x.slug for x in self.meta.supported_languages.all()]

Expand Down
14 changes: 7 additions & 7 deletions dbdb/core/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,12 @@ def test_inputs_quantity(self):
d = pq(response.content)
filtergroups = d('div.filter-group')
# Add two for the year filtergroups
# Add nine for country, OS, project type, PL, inspired, derived, embedded compatiable, licenses
# Add nine for country, OS, project type, PL, inspired, derived, embedded compatible, licenses
#pprint(filtergroups)
self.assertEquals(quantity + 2 + 9, len(filtergroups))
return

def test_search_with_insuficient_data(self):
def test_search_with_insufficient_data(self):
data = {
'feature1': ['option1'],
}
Expand All @@ -198,7 +198,7 @@ def test_search_with_insuficient_data(self):
self.assertContains(response, 'No databases found')
return

def test_search_with_suficient_data(self):
def test_search_with_sufficient_data(self):
data = {
'feature1': ['option3'],
}
Expand Down Expand Up @@ -319,15 +319,15 @@ def test_can_access_home(self):
self.assertEquals(response.status_code, 200)
return

def test_buttons_hiden_when_not_authenticated(self):
def test_buttons_hidden_when_not_authenticated(self):
response = self.client.get(reverse('home'))
self.assertNotContains(
response,
'<a class="nav-link btn btn-outline-secondary" href="/create-db/">Create Database</a>',
)
return

def test_buttons_hiden_when_not_superuser(self):
def test_buttons_hidden_when_not_superuser(self):
self.client.login(username='testuser', password='testpassword')
response = self.client.get(reverse('home'))
self.assertNotContains(
Expand All @@ -339,9 +339,9 @@ def test_buttons_hiden_when_not_superuser(self):

def test_buttons_shows_when_superuser(self):
self.client.login(username='admin', password='testpassword')
# Load stats insead of home so that we don't get a cached
# Load stats instead of home so that we don't get a cached
# result. Yes we try to override settings of the cache
# up aove to disable it but it doesn't work
# up above to disable it but it doesn't work
response = self.client.get(reverse('stats'))
self.assertContains(
response,
Expand Down
4 changes: 2 additions & 2 deletions dbdb/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ def post(self, request, slug=None):
sf.description = value
sf.save()
pass
elif '_citation'in field_name:
elif '_citation' in field_name:
sf, _ = SystemFeature.objects.get_or_create(
version=db_version,
feature=feature
Expand All @@ -1234,7 +1234,7 @@ def post(self, request, slug=None):
sf.citations.add(cit_url)
pass
pass
elif '_choices'in field_name:
elif '_choices' in field_name:
sf, _ = SystemFeature.objects.get_or_create(
version=db_version,
feature=feature
Expand Down
2 changes: 1 addition & 1 deletion templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<div class="col-md-5 col-lg-4">
<div class="text-center text-md-right footer-text">
<a href="mailto:[email protected]" class="btn-floating btn-sm rgba-white-slight"><i class="fa fa-envelope"></i> Contact</a>
<a href="https://github.com/cmu-db/dbdb.io" class="btn-floating btn-sm"><i class="fab fa-github"></i> Github</a>
<a href="https://github.com/cmu-db/dbdb.io" class="btn-floating btn-sm"><i class="fab fa-github"></i> GitHub</a>
</div>
</div>
</div>
Expand Down