diff --git a/document_choose_directory/__openerp__.py b/document_choose_directory/__openerp__.py
index fc5ae762..33e2d00d 100644
--- a/document_choose_directory/__openerp__.py
+++ b/document_choose_directory/__openerp__.py
@@ -26,13 +26,19 @@
"license": "AGPL-3",
"complexity": "normal",
"category": "Knowledge",
+ 'description': """
+ The Technical module name is changed
+ document to document_document
+ ==============================================
+
+""",
"depends": [
- 'document',
+ 'document_document',
'web',
],
"data": [
"view/qweb.xml",
- "view/document_directory.xml",
+ "view/document_directory.xml","view/attachement_view.xml"
],
"js": [
'static/src/js/document_choose_directory.js',
@@ -46,8 +52,8 @@
"test": [
],
"auto_install": False,
- 'installable': False,
- "application": False,
+ 'installable': True,
+ "application": True,
"external_dependencies": {
'python': [],
},
diff --git a/document_choose_directory/controllers/binary.py b/document_choose_directory/controllers/binary.py
index 47570ac3..5eece958 100644
--- a/document_choose_directory/controllers/binary.py
+++ b/document_choose_directory/controllers/binary.py
@@ -25,6 +25,7 @@ from openerp.addons.web.controllers.main import Binary
class Binary(Binary):
@http.route('/web/binary/upload_attachment', type='http', auth="user")
def upload_attachment(self, callback, model, id, ufile, directory_id=None):
+ print '22222222'
if directory_id:
# we can't use default_parent_id because of
# the ir_attachment.create overwrite in document
diff --git a/document_choose_directory/static/src/css/document_choose_directory.css b/document_choose_directory/static/src/css/document_choose_directory.css
index b0ae9693..2b8fcd51 100644
--- a/document_choose_directory/static/src/css/document_choose_directory.css
+++ b/document_choose_directory/static/src/css/document_choose_directory.css
@@ -30,3 +30,40 @@ li.oe_attachment_directory
{
cursor: default !important;
}
+
+.openerp .oe_hidden_input_file input.o_form_input_file {
+ z-index: 0;
+ line-height: 0;
+ font-size: 12px;
+ position: initial;
+ top: 1px;
+ left: 0;
+ right: 0;
+ opacity: 0;
+ filter: alpha(opacity=0);
+ -ms-filter: "alpha(opacity=0)";
+ margin: 0;
+ padding: 0;
+}
+
+.openerp input, .openerp textarea, .openerp select {
+ padding: 2px 4px;
+ border: 1px solid #ccc;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ background: white;
+ width: 100%;
+}
+
+
+.fa-trash-o {
+ display: inline-block;
+ font: normal normal normal 14px/1 FontAwesome;
+ font-size: inherit;
+ text-rendering: auto;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ margin-right: -5px;
+ color: brown;
+}
\ No newline at end of file
diff --git a/document_choose_directory/static/src/js/document_choose_directory.js b/document_choose_directory/static/src/js/document_choose_directory.js
index b3e33e87..14eda796 100644
--- a/document_choose_directory/static/src/js/document_choose_directory.js
+++ b/document_choose_directory/static/src/js/document_choose_directory.js
@@ -56,21 +56,39 @@ openerp.document_choose_directory = function(instance)
attachments_per_directory = [];
_.chain(attachments)
.groupBy(
- function(a) { return a.parent_id[0] })
+ function(a) {
+ console.log("a.parent_id[0]");
+ console.log(a.parent_id[0]);
+ return a.parent_id[0] })
.sortBy(function(attachments) {
+
+ console.log("attachments[0].parent_id[1]");
+ console.log(attachments[0].parent_id[1]);
return attachments[0].parent_id[1];
})
.each(
function(group)
- {
+
+ { console.log("attachments_per_directory");
+ console.log(attachments_per_directory);
+ console.log("group");
+ console.log(group);
+ console.log(".first(group).parent_id[1]");
+ console.log(_.first(group).parent_id[1]);
+
+
attachments_per_directory.push({
- name: _.first(group).parent_id[1] ||
- instance.web._t('No directory'),
- classname: 'oe_attachment_directory',
+ name: _.first(group).parent_id[1] ||instance.web._t('No directory'),classname: 'oe_attachment_directory',
});
+
+ console.log("attachments_per_directory");
+ console.log(attachments_per_directory);
self.sort_attachments(group).each(function(a)
- {
+
+ { console.log("a");
+ console.log(a);
attachments_per_directory.push(a);
+ console.log(attachments_per_directory);
});
});
@@ -85,7 +103,8 @@ openerp.document_choose_directory = function(instance)
});
},
sort_attachments: function(attachments)
- {
+ { console.log("_.chain(attachments).sortBy('name');");
+ console.log(_.chain(attachments).sortBy('name'));
return _.chain(attachments).sortBy('name');
},
});
diff --git a/document_choose_directory/static/src/xml/document_choose_directory.xml b/document_choose_directory/static/src/xml/document_choose_directory.xml
index 650a40ee..a957c431 100644
--- a/document_choose_directory/static/src/xml/document_choose_directory.xml
+++ b/document_choose_directory/static/src/xml/document_choose_directory.xml
@@ -1,15 +1,20 @@
-
+
+
+
+
+
+
-
+
this.attr('t-if', "section.name == 'files' and !item.callback and item.classname != 'oe_attachment_directory'");
@@ -17,3 +22,4 @@
+
diff --git a/document_choose_directory/view/document_directory.xml b/document_choose_directory/view/document_directory.xml
index 033b12c5..42c4a8f5 100644
--- a/document_choose_directory/view/document_directory.xml
+++ b/document_choose_directory/view/document_directory.xml
@@ -3,15 +3,15 @@
document.directory
-
+
-
+
-
+
{'invisible': [('type', '!=', 'ressource')]}
-
+
{'invisible': [('type', '!=', 'ressource')]}