infopark_fiona7 1.5.5.5.1 → 1.6.1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +17 -0
- data/app/assets/javascripts/fiona7/task_list_dialog.js +2 -2
- data/app/assets/javascripts/fiona7/templates.js +1 -16
- data/app/assets/javascripts/fiona7/translations.js +22 -23
- data/app/assets/javascripts/fiona7_ui.js +56 -59
- data/app/assets/javascripts/scrivito_patches/base_obj_path.js +11 -5
- data/app/assets/javascripts/scrivito_patches/binary_request.js +53 -0
- data/app/assets/javascripts/scrivito_patches/client/ajax.js +122 -0
- data/app/assets/javascripts/scrivito_patches/{models/api → client}/basic_obj.js +150 -243
- data/app/assets/javascripts/scrivito_patches/client/cms_rest_api.js +209 -0
- data/app/assets/javascripts/scrivito_patches/components/sidebar/workspaces_panel.js +325 -0
- data/app/assets/javascripts/scrivito_patches/components/sidebar/workspaces_panel.js.jsx +294 -0
- data/app/assets/javascripts/scrivito_patches/models/{obj.js → legacy_obj.js} +27 -54
- data/app/assets/stylesheets/fiona7_ui.css.scss +2 -0
- data/app/controllers/fiona7/release_controller.rb +7 -6
- data/app/controllers/fiona7/sessions_controller.rb +10 -2
- data/app/controllers/fiona7/uploads_controller.rb +22 -0
- data/app/controllers/fiona7_login_page_controller.rb +3 -0
- data/app/controllers/scrivito/obj_class_controller.rb +28 -5
- data/app/views/fiona7/release/preview.html.erb +5 -38
- data/app/views/fiona7_login_page/index.html.erb +6 -0
- data/config/precedence_routes.rb +7 -7
- data/infopark_fiona7.gemspec +2 -2
- data/lib/fiona7/attribute_readers/number_as_string.rb +6 -1
- data/lib/fiona7/attribute_writers/binary_as_binary.rb +4 -2
- data/lib/fiona7/attribute_writers/binary_as_linklist.rb +4 -2
- data/lib/fiona7/builder/container_chain_builder.rb +50 -0
- data/lib/fiona7/builder/indirect_blob_builder.rb +7 -47
- data/lib/fiona7/builder/indirect_blob_builder_for_obj.rb +14 -0
- data/lib/fiona7/builder/lazy_blob_copier.rb +68 -14
- data/lib/fiona7/builder/obj_builder.rb +6 -32
- data/lib/fiona7/builder/obj_updater.rb +12 -4
- data/lib/fiona7/builder/widget_builder.rb +1 -1
- data/lib/fiona7/controllers/rest_api/blob_controller.rb +8 -2
- data/lib/fiona7/controllers/rest_api/obj_controller.rb +12 -8
- data/lib/fiona7/controllers/rest_api/workspace_controller.rb +6 -0
- data/lib/fiona7/engine.rb +49 -3
- data/lib/fiona7/forbidden_obj_classes.rb +14 -3
- data/lib/fiona7/linked_id_finder.rb +44 -0
- data/lib/fiona7/name_and_parent_from_path.rb +11 -0
- data/lib/fiona7/referenced_id_finder.rb +24 -0
- data/lib/fiona7/release_collector.rb +85 -0
- data/lib/fiona7/routers/rest_api.rb +2 -0
- data/lib/fiona7/scrivito_patches/cms_field_tag.rb +1 -0
- data/lib/fiona7/scrivito_patches/cms_rest_api.rb +16 -16
- data/lib/fiona7/scrivito_patches/cms_routing.rb +1 -0
- data/lib/fiona7/scrivito_patches/link_parser.rb +10 -7
- data/lib/fiona7/scrivito_patches/workspace.rb +0 -5
- data/lib/fiona7/super_id_finder.rb +68 -0
- data/lib/fiona7/super_object_finder.rb +5 -20
- data/lib/fiona7/temporary_uploader.rb +33 -0
- data/lib/fiona7/upload_path_selector.rb +17 -0
- data/lib/fiona7/verity_search_engine.rb +25 -12
- data/lib/fiona7/version.rb +1 -1
- metadata +23 -19
- data/app/assets/javascripts/fiona7/task_list_command.js +0 -15
- data/app/assets/javascripts/fiona7/task_list_menu_item.js +0 -30
- data/app/assets/javascripts/scrivito_patches/ajax.js +0 -225
- data/app/assets/javascripts/scrivito_patches/attribute_serializer.js +0 -259
- data/app/assets/javascripts/scrivito_patches/binary_utils.js +0 -33
- data/app/assets/javascripts/scrivito_patches/cms_rest_api.js +0 -371
- data/app/assets/javascripts/scrivito_patches/models/binary_field_element.js +0 -53
- data/app/assets/javascripts/scrivito_patches/obj_serializer.js +0 -91
- data/lib/fiona7/scrivito_patches/attribute_serializer.rb +0 -37
- data/lib/fiona7/scrivito_patches/model_library.rb +0 -19
- data/lib/fiona7/scrivito_patches/obj_params_parser.rb +0 -20
@@ -0,0 +1,294 @@
|
|
1
|
+
(() => {
|
2
|
+
scrivito.Sidebar.WorkspacesPanel = scrivito.createReactClass({
|
3
|
+
propTypes: {
|
4
|
+
isActive: React.PropTypes.bool.isRequired,
|
5
|
+
},
|
6
|
+
|
7
|
+
render() {
|
8
|
+
if (!this.props.isActive) {
|
9
|
+
return null;
|
10
|
+
}
|
11
|
+
|
12
|
+
return (
|
13
|
+
<ReactCustomScrollbars.Scrollbars
|
14
|
+
className="scrivito_second_level_content scrivito_workspaces_panel scrivito_dark">
|
15
|
+
{/*
|
16
|
+
PATCH BEGINS HERE
|
17
|
+
<GeneralWorkspacesGroup />
|
18
|
+
PATCH ENDS HERE
|
19
|
+
*/}
|
20
|
+
<CurrentWorkspaceGroup />
|
21
|
+
<OtherWorkspacesGroup />
|
22
|
+
</ReactCustomScrollbars.Scrollbars>
|
23
|
+
);
|
24
|
+
},
|
25
|
+
});
|
26
|
+
|
27
|
+
const GeneralWorkspacesGroup = scrivito.createReactClass({
|
28
|
+
render() {
|
29
|
+
return (
|
30
|
+
<div className="scrivito_general_workspaces_group">
|
31
|
+
<div className="scrivito_sidebar_separator">
|
32
|
+
<span>{scrivito.t('sidebar.workspaces_panel.general_workspaces_group.title')}</span>
|
33
|
+
</div>
|
34
|
+
|
35
|
+
<ul className="scrivito_sidebar_action">
|
36
|
+
<CreateWorkspaceButton />
|
37
|
+
<PublishHistoryButton />
|
38
|
+
</ul>
|
39
|
+
</div>
|
40
|
+
);
|
41
|
+
},
|
42
|
+
});
|
43
|
+
|
44
|
+
const CurrentWorkspaceGroup = scrivito.createReactClass({
|
45
|
+
render() {
|
46
|
+
const currentWorkspace = scrivito.Workspace.selected;
|
47
|
+
|
48
|
+
let currentWorkspaceButtons;
|
49
|
+
|
50
|
+
if (currentWorkspace.isEditable()) {
|
51
|
+
currentWorkspaceButtons = (
|
52
|
+
<ul className="scrivito_sidebar_action">
|
53
|
+
{/* PATCH BEINGS HERE */}
|
54
|
+
|
55
|
+
{/*
|
56
|
+
<PublishButton workspace={currentWorkspace} />
|
57
|
+
<ChangesButton workspace={currentWorkspace }/>
|
58
|
+
<SettingsButton workspace={currentWorkspace} />
|
59
|
+
<RebaseButton workspace={currentWorkspace} />
|
60
|
+
*/}
|
61
|
+
<TasksButton workspace={currentWorkspace} />
|
62
|
+
<ChangesButton workspace={currentWorkspace }/>
|
63
|
+
|
64
|
+
{/* PATCH ENDS HERE */}
|
65
|
+
</ul>
|
66
|
+
);
|
67
|
+
}
|
68
|
+
|
69
|
+
return (
|
70
|
+
<div className="scrivito_current_workspace_group">
|
71
|
+
<div className="scrivito_sidebar_separator">
|
72
|
+
<span>{scrivito.t('sidebar.workspaces_panel.current_workspace_group.title')}</span>
|
73
|
+
</div>
|
74
|
+
|
75
|
+
<scrivito.Sidebar.WorkspaceList workspaces={[currentWorkspace]} isActive={true} />
|
76
|
+
|
77
|
+
{currentWorkspaceButtons}
|
78
|
+
</div>
|
79
|
+
);
|
80
|
+
},
|
81
|
+
});
|
82
|
+
|
83
|
+
const OtherWorkspacesGroup = scrivito.createReactClass({
|
84
|
+
render() {
|
85
|
+
return (
|
86
|
+
<div className="scrivito_other_workspaces_group">
|
87
|
+
<div className="scrivito_sidebar_separator">
|
88
|
+
<span>{scrivito.t('sidebar.workspaces_panel.other_workspaces_group.title')}</span>
|
89
|
+
</div>
|
90
|
+
|
91
|
+
<OtherWorkspacesList />
|
92
|
+
</div>
|
93
|
+
);
|
94
|
+
},
|
95
|
+
});
|
96
|
+
|
97
|
+
const OtherWorkspacesList = scrivito.createReactClass({
|
98
|
+
shouldRenderLoader: true,
|
99
|
+
|
100
|
+
render() {
|
101
|
+
const currentWorkspace = scrivito.Workspace.selected;
|
102
|
+
|
103
|
+
let otherWorkspaces = currentWorkspace.otherEditableWorkspaces;
|
104
|
+
|
105
|
+
if (currentWorkspace.isEditable()) {
|
106
|
+
otherWorkspaces = [
|
107
|
+
scrivito.Workspace.published,
|
108
|
+
...otherWorkspaces,
|
109
|
+
];
|
110
|
+
}
|
111
|
+
|
112
|
+
return <scrivito.Sidebar.WorkspaceList workspaces={otherWorkspaces} />;
|
113
|
+
},
|
114
|
+
});
|
115
|
+
|
116
|
+
const CreateWorkspaceButton = scrivito.createReactClass({
|
117
|
+
render() {
|
118
|
+
return (
|
119
|
+
<li className={ this._buttonClassName() } title={ this._buttonHint() }
|
120
|
+
onClick={ this._onClick }>
|
121
|
+
<i className="scrivito_icon scrivito_icon_inv_plus scrivito_green"></i>
|
122
|
+
<span>{scrivito.t('sidebar.workspaces_panel.create_workspace_button.title')}</span>
|
123
|
+
</li>
|
124
|
+
);
|
125
|
+
},
|
126
|
+
|
127
|
+
_onClick(e) {
|
128
|
+
if (this._isEnabled()) {
|
129
|
+
scrivito.create_workspace_command().execute();
|
130
|
+
}
|
131
|
+
|
132
|
+
e.stopPropagation();
|
133
|
+
},
|
134
|
+
|
135
|
+
_buttonClassName() {
|
136
|
+
let className = 'scrivito_create_workspace_button scrivito_sidebar_action_item';
|
137
|
+
|
138
|
+
if (!this._isEnabled()) {
|
139
|
+
className += ' scrivito_disabled';
|
140
|
+
}
|
141
|
+
|
142
|
+
return className;
|
143
|
+
},
|
144
|
+
|
145
|
+
_buttonHint() {
|
146
|
+
if (!this._isEnabled()) {
|
147
|
+
return scrivito.t('sidebar.workspaces_panel.create_workspace_button.is_disabled');
|
148
|
+
}
|
149
|
+
|
150
|
+
return scrivito.t('sidebar.workspaces_panel.create_workspace_button.hint');
|
151
|
+
},
|
152
|
+
|
153
|
+
_isEnabled() {
|
154
|
+
return scrivito.User.current.can('create');
|
155
|
+
},
|
156
|
+
});
|
157
|
+
|
158
|
+
const PublishHistoryButton = scrivito.createReactClass({
|
159
|
+
render() {
|
160
|
+
return (
|
161
|
+
<li className="scrivito_publish_history_button scrivito_sidebar_action_item"
|
162
|
+
title={ scrivito.t('sidebar.workspaces_panel.publish_history_button.hint') }
|
163
|
+
onClick={ this._onClick }>
|
164
|
+
<i className="scrivito_icon scrivito_icon_history"></i>
|
165
|
+
<span>{scrivito.t('sidebar.workspaces_panel.publish_history_button.title')}</span>
|
166
|
+
</li>
|
167
|
+
);
|
168
|
+
},
|
169
|
+
|
170
|
+
_onClick(e) {
|
171
|
+
scrivito.PublishHistoryDialog.open();
|
172
|
+
e.stopPropagation();
|
173
|
+
},
|
174
|
+
});
|
175
|
+
|
176
|
+
const ChangesButton = createWorkspaceButtonClass({
|
177
|
+
name: 'changes',
|
178
|
+
icon: 'edited',
|
179
|
+
verb: 'read',
|
180
|
+
onClick() {
|
181
|
+
scrivito.openWorkspaceChanges();
|
182
|
+
},
|
183
|
+
});
|
184
|
+
|
185
|
+
const PublishButton = createWorkspaceButtonClass({
|
186
|
+
name: 'publish',
|
187
|
+
verb: 'publish',
|
188
|
+
color: 'green',
|
189
|
+
|
190
|
+
onClick(workspace) {
|
191
|
+
const publisher = new scrivito.WorkspacePublisher(workspace);
|
192
|
+
scrivito.publishWorkspace(workspace, publisher);
|
193
|
+
},
|
194
|
+
});
|
195
|
+
|
196
|
+
/* PATCH BEGINS HERE */
|
197
|
+
const TasksButton = createWorkspaceButtonClass({
|
198
|
+
name: 'tasks',
|
199
|
+
icon: 'clipboard',
|
200
|
+
verb: 'read',
|
201
|
+
onClick() {
|
202
|
+
scrivito.task_list_dialog.open();
|
203
|
+
},
|
204
|
+
});
|
205
|
+
/* PATCH ENDS HERE */
|
206
|
+
|
207
|
+
const SettingsButton = createWorkspaceButtonClass({
|
208
|
+
name: 'settings',
|
209
|
+
verb: 'invite_to',
|
210
|
+
onClick(workspace) {
|
211
|
+
scrivito.openWorkspaceSettings(workspace);
|
212
|
+
},
|
213
|
+
});
|
214
|
+
|
215
|
+
const RebaseButton = createWorkspaceButtonClass({
|
216
|
+
name: 'rebase',
|
217
|
+
icon: 'refresh',
|
218
|
+
verb: 'write',
|
219
|
+
|
220
|
+
isButtonDisabled(workspace) {
|
221
|
+
return workspace.isAutoUpdate();
|
222
|
+
},
|
223
|
+
|
224
|
+
onClick(workspace) {
|
225
|
+
const legacyWorkspace = scrivito.legacy_workspace.fromWorkspace(workspace);
|
226
|
+
scrivito.rebase_workspace_command(legacyWorkspace).execute();
|
227
|
+
},
|
228
|
+
});
|
229
|
+
|
230
|
+
function createWorkspaceButtonClass({ name, icon, color, verb, isButtonDisabled, onClick }) {
|
231
|
+
return scrivito.createReactClass({
|
232
|
+
propTypes: {
|
233
|
+
workspace: React.PropTypes.instanceOf(scrivito.Workspace).isRequired,
|
234
|
+
},
|
235
|
+
|
236
|
+
render() {
|
237
|
+
if (isButtonDisabled && isButtonDisabled(this.props.workspace)) {
|
238
|
+
return null;
|
239
|
+
}
|
240
|
+
|
241
|
+
return (
|
242
|
+
<li className={ this._buttonClassName() }
|
243
|
+
title={ this._title() }
|
244
|
+
onClick={ this._onClick }>
|
245
|
+
<i className={ this._iconClassName() }></i>
|
246
|
+
<span>{scrivito.t(`sidebar.workspaces_panel.${name}_button.title`)}</span>
|
247
|
+
</li>
|
248
|
+
);
|
249
|
+
},
|
250
|
+
|
251
|
+
_buttonClassName() {
|
252
|
+
let className = `scrivito_sidebar_action_item scrivito_${name}_button`;
|
253
|
+
|
254
|
+
if (!this._canAccessWorkspace()) {
|
255
|
+
className += ' scrivito_disabled';
|
256
|
+
}
|
257
|
+
|
258
|
+
return className;
|
259
|
+
},
|
260
|
+
|
261
|
+
_iconClassName() {
|
262
|
+
let className = `scrivito_icon scrivito_icon_${icon || name}`;
|
263
|
+
|
264
|
+
if (color) {
|
265
|
+
className += ` scrivito_${color}`;
|
266
|
+
}
|
267
|
+
|
268
|
+
return className;
|
269
|
+
},
|
270
|
+
|
271
|
+
_title() {
|
272
|
+
const localesPrefix = `sidebar.workspaces_panel.${name}_button`;
|
273
|
+
|
274
|
+
if (!this._canAccessWorkspace()) {
|
275
|
+
return scrivito.t(`${localesPrefix}.is_forbidden`);
|
276
|
+
}
|
277
|
+
|
278
|
+
return scrivito.t(`${localesPrefix}.hint`);
|
279
|
+
},
|
280
|
+
|
281
|
+
_canAccessWorkspace() {
|
282
|
+
return scrivito.User.current.can(verb, this.props.workspace);
|
283
|
+
},
|
284
|
+
|
285
|
+
_onClick(e) {
|
286
|
+
if (this._canAccessWorkspace()) {
|
287
|
+
onClick(this.props.workspace);
|
288
|
+
}
|
289
|
+
|
290
|
+
e.stopPropagation();
|
291
|
+
},
|
292
|
+
});
|
293
|
+
}
|
294
|
+
})();
|
@@ -2,7 +2,7 @@
|
|
2
2
|
var write_promises = {};
|
3
3
|
|
4
4
|
_.extend(scrivito, {
|
5
|
-
|
5
|
+
legacy_obj: {
|
6
6
|
create_instance: function(params) {
|
7
7
|
var that = {
|
8
8
|
id: function() {
|
@@ -81,19 +81,6 @@
|
|
81
81
|
},
|
82
82
|
// -- PATCH ENDS HERE --
|
83
83
|
|
84
|
-
save: function(attrs) {
|
85
|
-
return scrivito.ObjSerializer.serialize(that.id(), attrs)
|
86
|
-
.then(function(serialized_attrs) {
|
87
|
-
return that.enqueue_ajax('PUT', 'objs/'+that.id(), {data: {obj: serialized_attrs}});
|
88
|
-
});
|
89
|
-
},
|
90
|
-
|
91
|
-
destroy: function() {
|
92
|
-
return that.enqueue_ajax('DELETE', 'objs/'+that.id()).then(function(result) {
|
93
|
-
return result.redirect_to;
|
94
|
-
});
|
95
|
-
},
|
96
|
-
|
97
84
|
revert: function() {
|
98
85
|
return that.enqueue_ajax('PUT', 'objs/'+that.id()+'/revert');
|
99
86
|
},
|
@@ -103,13 +90,6 @@
|
|
103
90
|
'objs/'+that.id()+'/revert_widget?widget_id='+widget_id);
|
104
91
|
},
|
105
92
|
|
106
|
-
conflicting_workspaces: function() {
|
107
|
-
return that.enqueue_ajax('GET', 'objs/'+that.id()+'/conflicting_workspaces')
|
108
|
-
.then(function(workspace_datas) {
|
109
|
-
return scrivito.workspace.from_data_collection(workspace_datas);
|
110
|
-
});
|
111
|
-
},
|
112
|
-
|
113
93
|
restore: function() {
|
114
94
|
return that.enqueue_ajax('PUT', 'objs/'+that.id()+'/restore');
|
115
95
|
},
|
@@ -142,7 +122,7 @@
|
|
142
122
|
|
143
123
|
enqueue_ajax: function() {
|
144
124
|
var args = arguments;
|
145
|
-
var ajax = function() { return scrivito.
|
125
|
+
var ajax = function() { return scrivito.ajaxWithErrorDialog.apply(null, args); };
|
146
126
|
|
147
127
|
if (args[0] === 'GET') { return ajax(); }
|
148
128
|
|
@@ -176,14 +156,18 @@
|
|
176
156
|
},
|
177
157
|
|
178
158
|
fetch_class_selection: function(path, params) {
|
179
|
-
|
180
|
-
return scrivito.ajax('GET', path).then(function(selection) {
|
159
|
+
return fetch_cached_class_selection(path, params).then(function(selection) {
|
181
160
|
var names = _.pluck(selection, 'name');
|
182
|
-
|
183
|
-
var
|
184
|
-
|
161
|
+
|
162
|
+
var recent;
|
163
|
+
if (names.length >= 15) {
|
164
|
+
recent = scrivito.obj_class_selection.recent(names);
|
165
|
+
}
|
166
|
+
|
167
|
+
var popular = _.take(_.intersection(scrivito.popular_obj_classes, names), 5);
|
168
|
+
|
185
169
|
return {
|
186
|
-
all:
|
170
|
+
all: selection,
|
187
171
|
recent: _.map(recent, function(name) { return _.findWhere(selection, {name: name}); }),
|
188
172
|
popular: _.map(popular, function(name) { return _.findWhere(selection, {name: name}); })
|
189
173
|
};
|
@@ -191,32 +175,7 @@
|
|
191
175
|
},
|
192
176
|
|
193
177
|
fetch_page_class_selection: function(params) {
|
194
|
-
return scrivito.
|
195
|
-
},
|
196
|
-
|
197
|
-
create: function(attrs) {
|
198
|
-
attrs._id = scrivito.random_id();
|
199
|
-
return scrivito.ObjSerializer.serialize(attrs._id, attrs).then(function(serialized_attrs) {
|
200
|
-
// -- PATCH BEGINS HERE --
|
201
|
-
if (!serialized_attrs._path) {
|
202
|
-
var page = scrivito.application_document().page();
|
203
|
-
var path = (typeof page.provided_path === 'function') && page.provided_path();
|
204
|
-
var blobName;
|
205
|
-
if (serialized_attrs.blob && typeof serialized_attrs.blob === 'object') {
|
206
|
-
blobName = serialized_attrs.blob.name || serialized_attrs.blob.filename;
|
207
|
-
}
|
208
|
-
if (path) {
|
209
|
-
var defaultName = blobName || serialized_attrs._obj_class || serialized_attrs._id;
|
210
|
-
serialized_attrs._path = path + "/" + defaultName;
|
211
|
-
}
|
212
|
-
}
|
213
|
-
// -- PATCH ENDS HERE --
|
214
|
-
var params = {data: {obj: serialized_attrs}};
|
215
|
-
return scrivito.ajax('POST', 'objs', params).then(function(obj_data) {
|
216
|
-
scrivito.obj_class_selection.store(serialized_attrs._obj_class);
|
217
|
-
return scrivito.obj.create_instance(obj_data);
|
218
|
-
});
|
219
|
-
});
|
178
|
+
return scrivito.legacy_obj.fetch_class_selection('objs/page_class_selection', params);
|
220
179
|
},
|
221
180
|
|
222
181
|
transfer_modifications: function(objs, workspace_id) {
|
@@ -233,4 +192,18 @@
|
|
233
192
|
}
|
234
193
|
}
|
235
194
|
});
|
195
|
+
|
196
|
+
|
197
|
+
function fetch_cached_class_selection(path, params) {
|
198
|
+
if (params) { path += '?'+$.param(params); }
|
199
|
+
|
200
|
+
var state = scrivito.modelState.subState('getClassSelection').subState(path);
|
201
|
+
var loader = function() {
|
202
|
+
return scrivito.Promise.resolve(scrivito.ajaxWithErrorDialog('GET', path));
|
203
|
+
};
|
204
|
+
var data = new scrivito.LoadableData({ state: state, loader: loader });
|
205
|
+
|
206
|
+
return scrivito.loadAsync(function() { return data.get(); });
|
207
|
+
}
|
208
|
+
|
236
209
|
}());
|
@@ -11,6 +11,8 @@ body > div.scrivito_topbar > div > div.scrivito_button_bar.scrivito_app.scrivito
|
|
11
11
|
}
|
12
12
|
*/
|
13
13
|
|
14
|
+
.scrivito_icon_clipboard:after { content: "\F06F"; }
|
15
|
+
|
14
16
|
@mixin fiona_logo() {
|
15
17
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+PHN2ZyB2ZXJzaW9uPSIxLjAiIGlkPSJFYmVuZV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDEwMCAyOC42IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxMDAgMjguNiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PGc+PHBhdGggZmlsbD0iI0NDMDAwMCIgZD0iTTAsMHYxNy40aDI2LjhjMS4zLDAsMi41LTEuMSwyLjUtMi40VjIuNGMwLTEuMy0xLjEtMi40LTIuNS0yLjRIMHoiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTMuNSw4LjljMC0wLjQsMC40LTAuNywwLjctMC43bDAsMGwwLDBoMS42djUuOGgtMi40VjguOUwxMy41LDguOXogTTE2LjUsNWMwLTAuNy0wLjUtMS4zLTEuOC0xLjNDMTMuOCwzLjcsMTMsNCwxMyw1LjFjMCwwLjcsMC40LDEuMywxLjcsMS4zQzE1LjcsNi40LDE2LjUsNi4xLDE2LjUsNUwxNi41LDV6IE0yMC4zLDZjMC45LDAsMS41LDAuNywxLjUsMS42bDAsMGMwLDAuOS0wLjYsMS42LTEuNSwxLjZoLTIuOXYyLjFoMy4xYzIuMywwLDMuNS0xLjgsMy41LTMuOGMwLTItMS4zLTMuOC0zLjctMy44aC0xLjNjLTAuNCwwLTAuNywwLjMtMC43LDAuN1Y2TDIwLjMsNkwyMC4zLDZ6Ii8+PGc+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTM3LjYsNS4xYy0xLDAtMS40LTAuNC0xLjQtMWMwLTAuOSwwLjYtMS4xLDEuNC0xLjFjMSwwLDEuNCwwLjQsMS40LDFDMzksNC44LDM4LjQsNS4xLDM3LjYsNS4xeiBNMzksNy42VjE0YzAsMC44LTAuNCwxLjItMS40LDEuMmMtMS4yLDAtMS40LTAuNS0xLjQtMS41VjcuM2MwLTAuNywwLjQtMS4yLDEtMS4yaDAuNkMzOC42LDYuMSwzOSw2LjYsMzksNy42eiIvPjwvZz48Zz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNNDguNSw4Ljl2NS40YzAsMC43LTAuNSwxLTEuMSwxSDQ3Yy0wLjYsMC0xLTAuMy0xLTF2LTMuN2MwLTEuNi0wLjUtMi40LTEuNS0yLjRjLTEsMC0xLjUsMC44LTEuNSwyLjV2My42YzAsMC43LTAuNSwxLTEuMSwxaC0wLjRjLTAuNiwwLTEtMC4zLTEtMS4xVjcuNGMwLTAuNywwLjQtMSwxLjItMWMwLjcsMCwxLjMsMC4yLDEuNywwLjJjMC44LDAsMS4xLTAuNCwyLjMtMC40QzQ3LjUsNi4yLDQ4LjUsNi45LDQ4LjUsOC45eiIvPjwvZz48Zz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNNTMuMiw5LjJWMTRjMCwwLjgtMC40LDEuMi0xLjMsMS4yYy0wLjksMC0xLjQtMC4zLTEuNC0xLjJWOS40YzAtMS42LTEuMy0xLjMtMS4zLTIuMmMwLTAuNiwwLjUtMC43LDEtMS4yYzAuMi0wLjIsMC4yLTAuNSwwLjUtMS41QzUwLjksNCw1MS40LDMsNTIuOSwzaDAuN2MwLjcsMCwxLjIsMC40LDEuMiwwLjljMCwwLjQsMC4xLDAuOC0wLjUsMS4xYy0wLjYsMC4zLTAuNywwLjUtMC43LDAuN2MwLDAuMywwLjEsMC40LDAuNiwwLjdjMC40LDAuMiwwLjYsMC41LDAuNiwwLjdjMCwwLjYtMC45LDAuOC0xLjIsMUM1My40LDguMyw1My4yLDguNyw1My4yLDkuMnoiLz48L2c+PGc+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTU5LjgsMTUuNGMtMi42LDAtNC43LTEuNi00LjctNC42YzAtMy4yLDIuMy00LjYsNC44LTQuNmMyLjIsMCw0LjgsMS4yLDQuOCw0LjZDNjQuNywxMy40LDYzLjEsMTUuNCw1OS44LDE1LjR6IE01OS45LDEzLjZjMS4zLDAsMi4zLTEuMiwyLjMtMi45YzAtMS41LTAuOC0yLjgtMi4zLTIuOGMtMS4zLDAtMi4zLDEtMi4zLDIuOEM1Ny42LDEyLjQsNTguNSwxMy42LDU5LjksMTMuNnoiLz48L2c+PGc+PHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTc0LjEsMTAuNmMwLDMtMS4zLDQuNy0zLjcsNC43Yy0wLjcsMC0xLjQtMC4yLTEuNi0wLjJjLTAuNiwwLTAuOSwwLjMtMC45LDEuNGMwLDEuMy0wLjIsMS43LTEuMiwxLjdjLTAuOSwwLTEuMi0wLjQtMS4yLTEuMlY3LjRjMC0wLjcsMC4zLTEsMS4xLTFjMC42LDAsMSwwLjIsMS41LDAuMmMwLjcsMCwwLjktMC40LDIuMi0wLjRDNzIuNiw2LjIsNzQuMSw3LjksNzQuMSwxMC42eiBNNjkuOCwxMy43YzEuOSwwLDIuMS0yLjQsMi4xLTMuMWMwLTEuNS0wLjctMi44LTItMi44Yy0xLjIsMC0yLjEsMS4xLTIuMSwzQzY3LjgsMTIuNSw2OC42LDEzLjcsNjkuOCwxMy43eiIvPjwvZz48Zz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNODEuNiwxNS4yYy0wLjcsMC0xLjEtMC4zLTEuNS0wLjNjLTAuOCwwLTEuNCwwLjYtMi41LDAuNmMtMS45LDAtMy0xLjEtMy0yLjZjMC0xLjUsMS4zLTIuNyw0LjEtMy4xYzEuMi0wLjEsMS41LTAuNiwxLjUtMWMwLTAuNy0wLjYtMS4xLTEuMi0xLjFjLTEuMywwLTEuMiwxLjEtMi43LDEuMWMtMC41LDAtMS0wLjEtMS0wLjdjMC0wLjYsMC43LTEuOSwzLjUtMS45YzIuNCwwLDMuOSwwLjYsMy45LDN2NS4yQzgyLjYsMTUsODIuMiwxNS4yLDgxLjYsMTUuMnogTTc4LjMsMTMuN2MwLjksMCwxLjgtMC44LDEuOC0xLjdjMC0wLjQtMC4yLTAuOC0wLjktMC44Yy0wLjcsMC0yLjIsMC41LTIuMiwxLjVDNzcuMSwxMy4yLDc3LjYsMTMuNyw3OC4zLDEzLjd6Ii8+PC9nPjxnPjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik04OC41LDYuM2MwLjYsMCwwLjksMC4zLDAuOSwxYzAsMC44LTAuMiwxLjItMS4yLDEuNWMtMC45LDAuMy0xLjQsMC45LTEuNCwxLjd2My41YzAsMC45LTAuMywxLjMtMS4xLDEuM2gtMC43Yy0wLjcsMC0xLTAuNS0xLTEuNFY3LjRjMC0wLjksMC4zLTEuMywxLjMtMS4zYzEuMSwwLDEuNSwwLjQsMS45LDAuNEM4Ny44LDYuNSw4OCw2LjMsODguNSw2LjN6Ii8+PC9nPjxnPjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik05Ny44LDEzLjljMC4yLDAuMywwLjMsMC42LDAuMywwLjhjMCwwLjQtMC4zLDAuNi0xLDAuNmMtMC44LDAtMS40LTAuMy0xLjctMC44bC0wLjktMS41Yy0wLjMtMC42LTAuNy0wLjgtMS0wLjhjLTAuNSwwLTEuMSwwLjQtMS4xLDEuN2MwLDAuOS0wLjIsMS40LTEuMiwxLjRjLTAuOSwwLTEuMi0wLjQtMS4yLTEuMlY0LjVjMC0wLjcsMC4zLTEuMSwxLjItMS4xYzAuOCwwLDEuMiwwLjMsMS4yLDEuMWMwLDMuNywwLDQuMiwwLjYsNC4yYzAuMiwwLDAuNC0wLjEsMS4xLTAuN2MwLDAsMC4yLTAuMiwwLjYtMC42YzAuNC0wLjQsMC42LTAuNiwwLjctMC42YzAuMy0wLjIsMC43LTAuMiwxLjMtMC4yaDAuMmMwLjUsMCwwLjgsMC4yLDAuOCwwLjVjMCwwLjItMC4xLDAuNC0wLjMsMC43TDk2LDljLTAuMywwLjQtMC40LDAuNy0wLjQsMC45YzAsMC4zLDAuMSwwLjYsMC4yLDAuN0w5Ny44LDEzLjl6Ii8+PC9nPjwvZz48dGV4dCB0cmFuc2Zvcm09Im1hdHJpeCgxIDAgMCAxIDY1LjI3MjggMjYuODM3MSkiIGZpbGw9IiNDQ0NDQ0MiIGZvbnQtZmFtaWx5PSInSGVsdmV0aWNhJyIgZm9udC1zaXplPSIxMCI+RmlvbmEgNzwvdGV4dD48L3N2Zz4=);
|
16
18
|
background-size:contain;
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'fiona7/widget_gc/garbage_collector'
|
2
|
+
require 'fiona7/recursive_object_finder'
|
2
3
|
|
3
4
|
module Fiona7
|
4
5
|
class ReleaseController < ActionController::Base
|
@@ -32,13 +33,13 @@ module Fiona7
|
|
32
33
|
def preview
|
33
34
|
self.in_rtc_workspace do
|
34
35
|
@obj = WriteObj.find(params[:id])
|
36
|
+
|
37
|
+
if Fiona7.release_collector && Fiona7.release_collector.respond_to?(:call)
|
38
|
+
@groups = Fiona7.release_collector.call(@obj.obj_id)
|
39
|
+
else
|
40
|
+
@groups = Fiona7::ReleaseCollector.call(@obj.obj_id)
|
41
|
+
end
|
35
42
|
|
36
|
-
@recursive = Fiona7::RecursiveObjectFinder.new(@obj)
|
37
|
-
|
38
|
-
@images = @recursive.images.select {|o| o.really_edited? }
|
39
|
-
@downloads = @recursive.downloads.select {|o| o.really_edited? }
|
40
|
-
@referenced = @recursive.referenced.select {|o| o.really_edited? }
|
41
|
-
@linked = @recursive.linked.select {|o| o.really_edited? }
|
42
43
|
|
43
44
|
render "preview", layout: false
|
44
45
|
end
|