Skip to content

Support strings, ints, and ObjectIds for _id #8

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.

Sign up for GitHub

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

Open
JeffAMcGee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support strings, ints, and ObjectIds for _id #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions mongoadmin_project/mongoadmin/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/$', views.DatabaseView.as_view()),
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/(?P<collection_name>[^/]+)/$', views.CollectionView.as_view()),
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/(?P<collection_name>[^/]+)/add/$', views.CreateDocumentView.as_view()),
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/(?P<collection_name>[^/]+)/(?P<pk>[a-z\d]+)/$', views.UpdateDocumentView.as_view()),
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/(?P<collection_name>[^/]+)/(?P<pk>[a-z\d]+)/delete/$', views.DeleteDocumentView.as_view()),
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/(?P<collection_name>[^/]+)/(?P<pk>[^/]+)/$', views.UpdateDocumentView.as_view()),
url(r'^mongo/(?P<connection_name>[^/]+)/(?P<database_name>[^/]+)/(?P<collection_name>[^/]+)/(?P<pk>[^/]+)/delete/$', views.DeleteDocumentView.as_view()),
)
17 changes: 14 additions & 3 deletions mongoadmin_project/mongoadmin/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,19 @@ def prepare_document(document):


class BaseDocumentView(ConnectionDetailMixin):
def infer_id(self, pk):
if len(pk)==24:
try:
return ObjectId(pk)
except pymongo.errors.InvalidId:
pass
try:
return int(pk)
except ValueError:
return pk

def get_document(self):
document = self.collection.find_one({'_id': ObjectId(self.kwargs['pk'])})
document = self.collection.find_one({'_id': self.infer_id(self.kwargs['pk'])})
return document

def get(self, request, *args, **kwargs):
Expand Down Expand Up @@ -222,7 +233,7 @@ def form_valid(self, form):
id = form.cleaned_data['id']
if id and '_id' not in obj:
# Reinsert id into document when editing an existing document.
obj['_id'] = ObjectId(id)
obj['_id'] = self.infer_id(id)
id = self.collection.save(obj)
messages.success(self.request, 'The document %s was saved successfully.' % id)
if '_continue' in self.request.POST:
Expand Down Expand Up @@ -259,6 +270,6 @@ class DeleteDocumentView(BaseDocumentView, TemplateView):
def post(self, request, *args, **kwargs):
self.setup_connection()
self.document = self.get_document()
self.collection.remove(ObjectId(self.kwargs['pk']))
self.collection.remove(self.infer_id(self.kwargs['pk']))
messages.success(self.request, 'The document %s was removed successfully.' % self.kwargs['pk'])
return HttpResponseRedirect('../../')