DC panel quick fix.

Last edited fix.

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 76d0456..e5876e9 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -307,7 +307,7 @@ def file_commit(request, path, repo):
 @with_repo
 def file_dc(request, path, repo):
     errors = None
 @with_repo
 def file_dc(request, path, repo):
     errors = None

-    rpath = file_path(fileid)
+    rpath = file_path(path)

 
     if request.method == 'POST':
         form = forms.DublinCoreForm(request.POST)
 
     if request.method == 'POST':
         form = forms.DublinCoreForm(request.POST)

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 0cbb934..f94d33c 100644 (file)
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -425,7 +425,7 @@ Editor.prototype.saveToBranch = function(msg)
                 if(self.autosaveTimer) {
                     clearTimeout(self.autosaveTimer);
                 }
                 if(self.autosaveTimer) {
                     clearTimeout(self.autosaveTimer);
                 }

-                if (data.warnings === null) {
+                if (data.warnings === null || data.warning === undefined) {

                     self.showPopup('save-successful');
                 } else {
                     self.showPopup('save-warn', data.warnings[0]);
                     self.showPopup('save-successful');
                 } else {
                     self.showPopup('save-warn', data.warnings[0]);

diff --git a/project/templates/explorer/file_list.html b/project/templates/explorer/file_list.html
index 4e5a12a..1eac095 100644 (file)
--- a/project/templates/explorer/file_list.html
+++ b/project/templates/explorer/file_list.html
@@ -55,7 +55,7 @@ $(function() {
        
        $.each(options.recentFiles, function(index) {
                var fileId = options.recentFiles[index].fileId;
        
        $.each(options.recentFiles, function(index) {
                var fileId = options.recentFiles[index].fileId;

-               $('#recent-file-list ul').append('<li><a href="/editor/' + fileId + '/">' + fileId + '</a></li>');
+               $('#recent-file-list ul').append('<li><a href="{% url editor_base %}'+fileId+'">' + fileId + '</a></li>');

        });
 });
 </script>
        });
 });
 </script>

diff --git a/project/urls.py b/project/urls.py
index a9fad54..2c1fab7 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -22,6 +22,7 @@ urlpatterns = patterns('',
     # Editor panels
     url(r'^editor/'+PATH_SEC+'/panel/(?P<name>[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'),
     url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'),
     # Editor panels
     url(r'^editor/'+PATH_SEC+'/panel/(?P<name>[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'),
     url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'),

+    url(r'^editor/$', 'explorer.views.file_list', name='editor_base'),

 
     url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'),
     url(r'^editor/'+PATH_SEC+'/split-success',
 
     url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'),
     url(r'^editor/'+PATH_SEC+'/split-success',