Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
b4875f4e
Commit
b4875f4e
authored
Aug 11, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Available / Required confusion in input widgets
parent
89fd7232
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
dream/platform/src/dream/Input_viewAvailableCapacitySpreadsheet.html
...orm/src/dream/Input_viewAvailableCapacitySpreadsheet.html
+1
-1
dream/platform/src/dream/Input_viewAvailableCapacitySpreadsheet.js
...tform/src/dream/Input_viewAvailableCapacitySpreadsheet.js
+4
-3
dream/platform/src/dream/Input_viewRequiredCapacitySpreadsheet.html
...form/src/dream/Input_viewRequiredCapacitySpreadsheet.html
+1
-1
dream/platform/src/dream/Input_viewRequiredCapacitySpreadsheet.js
...atform/src/dream/Input_viewRequiredCapacitySpreadsheet.js
+3
-4
No files found.
dream/platform/src/dream/Input_viewAvailableCapacitySpreadsheet.html
View file @
b4875f4e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<head>
<head>
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
Edit
Available
Capacity Spreadsheet
</title>
<title>
Edit
Required
Capacity Spreadsheet
</title>
<script
src=
"../<%= copy.rsvp.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= copy.rsvp.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= copy.renderjs.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= copy.renderjs.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= curl.jquery.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= curl.jquery.relative_dest %>"
type=
"text/javascript"
></script>
...
...
dream/platform/src/dream/Input_viewAvailableCapacitySpreadsheet.js
View file @
b4875f4e
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
})
})
.
push
(
function
(
body
)
{
.
push
(
function
(
body
)
{
var
data
=
JSON
.
parse
(
body
);
var
data
=
JSON
.
parse
(
body
);
data
.
capacity_by_
project
_spreadsheet
=
JSON
.
parse
(
editor_data
);
data
.
capacity_by_
station
_spreadsheet
=
JSON
.
parse
(
editor_data
);
return
gadget
.
aq_putAttachment
({
return
gadget
.
aq_putAttachment
({
"
_id
"
:
gadget
.
props
.
jio_key
,
"
_id
"
:
gadget
.
props
.
jio_key
,
"
_attachment
"
:
"
body.json
"
,
"
_attachment
"
:
"
body.json
"
,
...
@@ -79,8 +79,9 @@
...
@@ -79,8 +79,9 @@
.
push
(
function
(
result_list
)
{
.
push
(
function
(
result_list
)
{
return
result_list
[
1
].
render
(
return
result_list
[
1
].
render
(
JSON
.
stringify
(
JSON
.
parse
(
result_list
[
0
])
JSON
.
stringify
(
JSON
.
parse
(
result_list
[
0
])
.
capacity_by_project_spreadsheet
),
.
capacity_by_station_spreadsheet
),
{
minSpareRows
:
1
}
{
minSpareCols
:
1
,
minSpareRows
:
1
}
);
);
});
});
})
})
...
...
dream/platform/src/dream/Input_viewRequiredCapacitySpreadsheet.html
View file @
b4875f4e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<head>
<head>
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
Edit
Required
Capacity Spreadsheet
</title>
<title>
Edit
Available
Capacity Spreadsheet
</title>
<script
src=
"../<%= copy.rsvp.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= copy.rsvp.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= copy.renderjs.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= copy.renderjs.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= curl.jquery.relative_dest %>"
type=
"text/javascript"
></script>
<script
src=
"../<%= curl.jquery.relative_dest %>"
type=
"text/javascript"
></script>
...
...
dream/platform/src/dream/Input_viewRequiredCapacitySpreadsheet.js
View file @
b4875f4e
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
})
})
.
push
(
function
(
body
)
{
.
push
(
function
(
body
)
{
var
data
=
JSON
.
parse
(
body
);
var
data
=
JSON
.
parse
(
body
);
data
.
capacity_by_
station
_spreadsheet
=
JSON
.
parse
(
editor_data
);
data
.
capacity_by_
project
_spreadsheet
=
JSON
.
parse
(
editor_data
);
return
gadget
.
aq_putAttachment
({
return
gadget
.
aq_putAttachment
({
"
_id
"
:
gadget
.
props
.
jio_key
,
"
_id
"
:
gadget
.
props
.
jio_key
,
"
_attachment
"
:
"
body.json
"
,
"
_attachment
"
:
"
body.json
"
,
...
@@ -79,9 +79,8 @@
...
@@ -79,9 +79,8 @@
.
push
(
function
(
result_list
)
{
.
push
(
function
(
result_list
)
{
return
result_list
[
1
].
render
(
return
result_list
[
1
].
render
(
JSON
.
stringify
(
JSON
.
parse
(
result_list
[
0
])
JSON
.
stringify
(
JSON
.
parse
(
result_list
[
0
])
.
capacity_by_station_spreadsheet
),
.
capacity_by_project_spreadsheet
),
{
minSpareCols
:
1
,
{
minSpareRows
:
1
}
minSpareRows
:
1
}
);
);
});
});
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment