浏览代码

[core] Remove the install all examples button

Put back the jobsub examples
Romain Rigaux 10 年之前
父节点
当前提交
48cd324

+ 2 - 17
apps/about/src/about/templates/admin_wizard.mako

@@ -70,23 +70,8 @@ ${ header.menubar() }
           </div>
           </div>
 
 
           <div id="step2" class="stepDetails hide">
           <div id="step2" class="stepDetails hide">
-            <div class="card card-tab card-listcontent">
-              <h2 class="card-heading simple">${ _('Install all the application examples') }</h2>
 
 
-              <div class="card-body">
-                <p>
-                <ul>
-                  <li>
-                    <a href="javascript:void(0)" class="installAllBtn" data-loading-text="${ _('Installing...') }">
-                      <i class="fa fa-download"></i> ${ _('All') }
-                    </a>
-                  </li>
-                </ul>
-                </p>
-              </div>
-            </div>
-
-          <div class="card card-home card-tab card-tab-bordertop card-listcontent">
+          <div class="card card-home card-tab card-listcontent">
             <h2 class="card-heading simple">${ _('Install individual application examples') }</h2>
             <h2 class="card-heading simple">${ _('Install individual application examples') }</h2>
           <div class="card-body">
           <div class="card-body">
             <p>
             <p>
@@ -149,7 +134,7 @@ ${ header.menubar() }
           % endif
           % endif
           % if 'jobsub' in app_names:
           % if 'jobsub' in app_names:
               <li>
               <li>
-                <a href="javascript:void(0)" class="installBtn" data-loading-text="${ _('Installing...') }"
+                <a href="javascript:void(0)" data-loading-text="${ _('Installing...') }"
                    data-sample-url="${ url('oozie:install_examples') }">
                    data-sample-url="${ url('oozie:install_examples') }">
                   <i class="fa fa-download"></i> ${ apps['jobsub'].nice_name }
                   <i class="fa fa-download"></i> ${ apps['jobsub'].nice_name }
                 </a>
                 </a>

+ 2 - 11
apps/oozie/src/oozie/management/commands/oozie_setup.py

@@ -95,18 +95,9 @@ class Command(NoArgsCommand):
   def install_examples(self):
   def install_examples(self):
     data_dir = LOCAL_SAMPLE_DIR.get()
     data_dir = LOCAL_SAMPLE_DIR.get()
 
 
-    managed_dir = os.path.join(data_dir, 'managed')
-    self._import_workflows(managed_dir, managed=True)
-
     unmanaged_dir = os.path.join(data_dir, 'unmanaged')
     unmanaged_dir = os.path.join(data_dir, 'unmanaged')
     self._import_workflows(unmanaged_dir, managed=False)
     self._import_workflows(unmanaged_dir, managed=False)
 
 
-    coordinators_dir = os.path.join(data_dir, 'coordinators')
-    self._import_coordinators(coordinators_dir)
-
-    bundles_dir = os.path.join(data_dir, 'bundles')
-    self._import_bundles(bundles_dir)
-
   def handle_noargs(self, **options):
   def handle_noargs(self, **options):
     self.user = install_sample_user()
     self.user = install_sample_user()
     self.fs = cluster.get_hdfs()
     self.fs = cluster.get_hdfs()
@@ -135,7 +126,7 @@ class Command(NoArgsCommand):
 
 
     if ENABLE_V2.get():
     if ENABLE_V2.get():
       management.call_command('loaddata', 'initial_oozie_examples.json', verbosity=2)
       management.call_command('loaddata', 'initial_oozie_examples.json', verbosity=2)
-    else:
-      self.install_examples()
+
+    self.install_examples()
 
 
     Document.objects.sync()
     Document.objects.sync()