-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Origin/user friendly searching #14
base: main
Are you sure you want to change the base?
Conversation
app/uid/views.py
Outdated
# Neo4j connection details | ||
NEO4J_USERNAME = os.getenv('NEO4J_USERNAME', 'neo4j') # Default username if env var not set | ||
NEO4J_PASSWORD = os.getenv('NEO4J_PASSWORD', 'password') # Default password if env var not set | ||
NEO4J_HOST = os.getenv("NEO4J_HOST", "localhost") # Default to localhost if not set |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This whole block shoul be removed -- get the connection string from settings.
from django.conf import settings
connection_url = settings.DATABASE_URL
…with TypeError to list records in results_data
@EdblackGitHub has this been merged with main recently? The UID generation stuff in |
…ovide a Warning on the user screen.
…e without context and provide warning.
I did do a git pull to get the latest changes, after I made the branch from main.
From: Trey Hayden ***@***.***>
Sent: Tuesday, November 19, 2024 2:21 PM
To: adlnet/LDSS-XSS ***@***.***>
Cc: Edward Black ***@***.***>; Mention ***@***.***>
Subject: Re: [adlnet/LDSS-XSS] Origin/user friendly searching (PR #14)
@EdblackGitHub<https://github.com/EdblackGitHub> has this been merged with main recently? The UID generation stuff in uid/views.py looks dated.
-
Reply to this email directly, view it on GitHub<#14 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/BLGCSAT4GFNBTGMPOUGM7F32BOFQ5AVCNFSM6AAAAABR3QDXPWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBWGU3DANRZGI>.
You are receiving this because you were mentioned.Message ID: ***@***.******@***.***>>
|
So the most recent version of that views file is here: https://github.com/adlnet/LDSS-XSS/blob/main/app/uid/views.py#L60 and the corresponding line in most recent version of this branch is showing up as: Your local one might be behind, if you tried to merge just the local branch without retrieving the most recent remote main. |
# self.link_to_term(term) | ||
|
||
|
||
class Alias(StructuredNode): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class looks like it's more related to terms yeah? Why is it in the UID portion of the project etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are in UID folder as I asked Florian if he had an ideal location or a preference for the search function location and he said I could leave it in the UID folder.
depends_on: | ||
- neo4j |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The neo4j dependency should not be removed here, as the app container does definitely depend on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uhh, I did not touch the .yml file for the manual search function.
Just merged in main into this one locally and things did update accordingly, so maybe try again on your end? For the compose file, the main's contents for that block are currently:
which are a good bit different, yeah? Double check that you did the merge order correctly, or this will end up being a big soup sandwich when it hits main. |
… point to NeoTerm.
Description: Added Manual user-friendly option for our code to search CCVs
Issue: Adding a User-friendly option to the CCVs searching
Dependencies: List dependencies on open pull requests, other issue/work tickets, etc.
Merge Deadline: Merge today 11/15/2024
Pre-Merge Checklist:
Post-Merge Checklist: