Merge pull request #445 from lithorus/master

Added ability to change branch in afwatch
CGRU · Mar 11, 2019 · e8c09b9 · e8c09b9
2 parents abe2ab2 + 81b5f5b
commit e8c09b9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/afanasy/src/watch/itemjob.cpp b/afanasy/src/watch/itemjob.cpp
@@ -104,6 +104,7 @@ void ItemJob::updateValues( af::Node * i_node, int i_type)
 	project              = afqt::stoq( job->getProject());
 	department           = afqt::stoq( job->getDepartment());
 	folders              = afqt::stoq( job->getFolders());
+	branch               = afqt::stoq( job->getBranch());
 	num_runningtasks     = job->getRunningTasksNum();
 	lifetime             = job->getTimeLife();
 	ppapproval           = job->isPPAFlag();

diff --git a/afanasy/src/watch/itemjob.h b/afanasy/src/watch/itemjob.h
@@ -45,6 +45,7 @@ class ItemJob : public ItemNode
 	QString service;
 	QString hostname;
 	QString username;
+	QString branch;
 	QString hostsmask;
 	QString hostsmask_exclude;
 	QString dependmask;

diff --git a/afanasy/src/watch/listjobs.cpp b/afanasy/src/watch/listjobs.cpp
@@ -304,6 +304,9 @@ void ListJobs::contextMenuEvent( QContextMenuEvent *event)
 
 	submenu = new QMenu( "Set Parameter", this);
 
+	action = new QAction( "Change Branch", this);
+	connect( action, SIGNAL( triggered() ), this, SLOT( actChangeBranch() ));
+	submenu->addAction( action);
 	action = new QAction( "Max Running Tasks", this);
 	connect( action, SIGNAL( triggered() ), this, SLOT( actMaxRunningTasks() ));
 	submenu->addAction( action);
@@ -684,6 +687,17 @@ void ListJobs::actWaitTime()
 	setParameter("time_wait", waittime);
 }
 
+void ListJobs::actChangeBranch()
+{
+	ItemJob* jobitem = (ItemJob*)getCurrentItem();
+	if( jobitem == NULL ) return;
+	QString current = jobitem->branch;
+	bool ok;
+	QString branch = QInputDialog::getText(this, "Change Branch", "Branch", QLineEdit::Normal, current, &ok);
+	if( !ok) return;
+	setParameter("branch", afqt::qtos( branch));
+}
+
 void ListJobs::actMaxRunningTasks()
 {
 	ItemJob* jobitem = (ItemJob*)getCurrentItem();

diff --git a/afanasy/src/watch/listjobs.h b/afanasy/src/watch/listjobs.h
@@ -43,6 +43,7 @@ private slots:
 	void actSetUser();
 	void actHostsMask();
 	void actHostsMaskExclude();
+	void actChangeBranch();
 	void actMaxRunningTasks();
 	void actMaxRunTasksPerHost();
 	void actDependMask();