git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0120bc4
)
unfinished business on newnames (unsaved pending changes..)
newnames
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 13 Nov 2013 07:24:41 +0000
(08:24 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 13 Nov 2013 07:24:41 +0000
(08:24 +0100)
myslice/urls.py
patch
|
blob
|
history
plugins/googlemap/static/js/googlemap.js
patch
|
blob
|
history
plugins/queryupdater/__init__.py
patch
|
blob
|
history
plugins/queryupdater/static/js/queryupdater.js
patch
|
blob
|
history
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
de14785
..
3210957
100644
(file)
--- a/
myslice/urls.py
+++ b/
myslice/urls.py
@@
-59,7
+59,7
@@
urlpatterns = patterns(
# Portal
url(r'^sample/', include('sample.urls')),
# Debug
# Portal
url(r'^sample/', include('sample.urls')),
# Debug
- url(r'^debug/', include('debug_platform.urls')),
+
#
url(r'^debug/', include('debug_platform.urls')),
#
# various trash views - bound to go away
#
#
# various trash views - bound to go away
#
diff --git
a/plugins/googlemap/static/js/googlemap.js
b/plugins/googlemap/static/js/googlemap.js
index
9a56d37
..
39e80cc
100644
(file)
--- a/
plugins/googlemap/static/js/googlemap.js
+++ b/
plugins/googlemap/static/js/googlemap.js
@@
-104,7
+104,7
@@
googlemap_debug_detailed=false;
// XXX BACKSLASHES original code was reading like this
//return this.escape_id(key_value).replace(/\\/g, '');
// however this sequence removes backslashes from hrn's and as a result
// XXX BACKSLASHES original code was reading like this
//return this.escape_id(key_value).replace(/\\/g, '');
// however this sequence removes backslashes from hrn's and as a result
- //
resources_selected
was getting all mixed up
+ //
queryupdater
was getting all mixed up
// querytable does publish hrn's with backslashes and that seems like the thing to do
return key_value;
},
// querytable does publish hrn's with backslashes and that seems like the thing to do
return key_value;
},
diff --git
a/plugins/queryupdater/__init__.py
b/plugins/queryupdater/__init__.py
index
9b347d3
..
ad345c8
100644
(file)
--- a/
plugins/queryupdater/__init__.py
+++ b/
plugins/queryupdater/__init__.py
@@
-3,12
+3,12
@@
from unfold.plugin import Plugin
class QueryUpdater(Plugin):
def template_file (self):
class QueryUpdater(Plugin):
def template_file (self):
- return "
resources_selected
.html"
+ return "
queryupdater
.html"
def requirements (self):
reqs = {
def requirements (self):
reqs = {
- 'js_files' : [ "js/
resources_selected
.js" ] ,
- 'css_files': [ "css/
resources_selected
.css" ],
+ 'js_files' : [ "js/
queryupdater
.js" ] ,
+ 'css_files': [ "css/
queryupdater
.css" ],
}
return reqs
}
return reqs
diff --git
a/plugins/queryupdater/static/js/queryupdater.js
b/plugins/queryupdater/static/js/queryupdater.js
index
ebfa6eb
..
7d7de24
100644
(file)
--- a/
plugins/queryupdater/static/js/queryupdater.js
+++ b/
plugins/queryupdater/static/js/queryupdater.js
@@
-80,12
+80,12
@@
do_reset: function(e)
{
do_reset: function(e)
{
- throw '
resources_selected
.do_reset Not implemented';
+ throw '
queryupdater
.do_reset Not implemented';
},
do_clear_annotations: function(e)
{
},
do_clear_annotations: function(e)
{
- throw '
resources_selected
.do_clear_annotations Not implemented';
+ throw '
queryupdater
.do_clear_annotations Not implemented';
},
/************************** GUI MANIPULATION **************************/
},
/************************** GUI MANIPULATION **************************/