Browse Source

HUE-990 [oozie] Only show the datasets belonging to the coordinator

Romain Rigaux 13 years ago
parent
commit
b119671

+ 1 - 1
apps/oozie/src/oozie/fixtures/initial_oozie_examples.json

@@ -2092,7 +2092,7 @@
       "coordinator": 21,
       "advanced_start_instance": "0",
       "frequency_unit": "days",
-      "uri": "/tmp/test-${username}/${YEAR}${MONTH}${DAY}",
+      "uri": "/tmp/test-coord-${coord:user()}/${YEAR}${MONTH}${DAY}",
       "start": "2012-12-31 00:00:00",
       "instance_choice": "default",
       "timezone": "America/Los_Angeles",

+ 0 - 12
apps/oozie/src/oozie/forms.py

@@ -364,12 +364,6 @@ class DatasetForm(forms.ModelForm):
     super(DatasetForm, self).__init__(*args, **kwargs)
 
 
-class DataInputSetForm(forms.ModelForm):
-  class Meta:
-    model = DataInput
-    exclude = ('coordinator')
-
-
 class DataInputForm(forms.ModelForm):
   class Meta:
     model = DataInput
@@ -384,12 +378,6 @@ class DataInputForm(forms.ModelForm):
       self.fields['name'].widget = forms.Select(choices=((param, param) for param in set(coordinator.workflow.find_parameters())))
 
 
-class DataOutputSetForm(forms.ModelForm):
-  class Meta:
-    model = DataOutput
-    exclude = ('coordinator')
-
-
 class DataOutputForm(forms.ModelForm):
   class Meta:
     model = DataOutput

+ 1 - 1
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -103,7 +103,7 @@ ${ layout.menubar(section='coordinators') }
               ${ coordinator_form['parameters'] | n,unicode }
               <div class="hide">
                 ${ utils.render_field(coordinator_form['timeout']) }
-                ${ coordinator_form['schema_version'] }
+                ${ coordinator_form['schema_version']  | n,unicode }
               </div>
             </div>
           </div>

+ 5 - 3
apps/oozie/src/oozie/views/editor.py

@@ -44,7 +44,7 @@ from oozie.management.commands import oozie_setup
 from oozie.models import Job, Workflow, History, Coordinator,\
                          Dataset, DataInput, DataOutput, ACTION_TYPES
 from oozie.forms import WorkflowForm, CoordinatorForm, DatasetForm,\
-  DataInputForm, DataInputSetForm, DataOutputForm, DataOutputSetForm, LinkForm,\
+  DataInputForm, DataOutputForm, LinkForm,\
   DefaultLinkForm, design_form_by_type, ParameterForm,\
   ImportWorkflowForm
 
@@ -284,8 +284,10 @@ def edit_coordinator(request, coordinator):
   history = History.objects.filter(submitter=request.user, job=coordinator).order_by('-submission_date')
 
   DatasetFormSet = inlineformset_factory(Coordinator, Dataset, form=DatasetForm, max_num=0, can_order=False, can_delete=True)
-  DataInputFormSet = inlineformset_factory(Coordinator, DataInput, form=DataInputSetForm, max_num=0, can_order=False, can_delete=True)
-  DataOutputFormSet = inlineformset_factory(Coordinator, DataOutput, form=DataOutputSetForm, max_num=0, can_order=False, can_delete=True)
+  DataInputFormSet = inlineformset_factory(Coordinator, DataInput, form=DataInputForm, max_num=0, can_order=False, can_delete=True)
+  DataInputFormSet.form = staticmethod(curry(DataInputForm, coordinator=coordinator))
+  DataOutputFormSet = inlineformset_factory(Coordinator, DataOutput, form=DataOutputForm, max_num=0, can_order=False, can_delete=True)
+  DataOutputFormSet.form = staticmethod(curry(DataOutputForm, coordinator=coordinator))
 
   dataset = Dataset(coordinator=coordinator)
   dataset_form = DatasetForm(instance=dataset, prefix='create')